[pve-devel] r6418 - pve-installer/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-04 13:01:39 +0200 (Thu, 04 Aug 2011)
New Revision: 6418

Modified:
   pve-installer/pve2/Makefile
   pve-installer/pve2/changelog.Debian
   pve-installer/pve2/control
   pve-installer/pve2/proxinstall
Log:
  * support new kernel parameter 'ext4' switch (use ext4 instead of ext3)

  * use 'ext3' by default



Modified: pve-installer/pve2/Makefile
===================================================================
--- pve-installer/pve2/Makefile	2011-08-04 10:16:15 UTC (rev 6417)
+++ pve-installer/pve2/Makefile	2011-08-04 11:01:39 UTC (rev 6418)
@@ -1,7 +1,7 @@
 # achtung: also set release in proxinstall!
 RELEASE=2.0
 
-DEB=pve-installer_2.0-1.deb
+DEB=pve-installer_2.0-2_all.deb
 
 INSTALLER_SOURCES=		\
 	unconfigured.sh 	\

Modified: pve-installer/pve2/changelog.Debian
===================================================================
--- pve-installer/pve2/changelog.Debian	2011-08-04 10:16:15 UTC (rev 6417)
+++ pve-installer/pve2/changelog.Debian	2011-08-04 11:01:39 UTC (rev 6418)
@@ -1,3 +1,11 @@
+pve-installer (2.0-2) unstable; urgency=low
+
+  * support new kernel parameter 'ext4' switch (use ext4 instead of ext3)
+
+  * use 'ext3' by default
+  
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 04 Aug 2011 12:58:27 +0200
+
 pve-installer (2.0-1) unstable; urgency=low
 
   * use ext4 fs

Modified: pve-installer/pve2/control
===================================================================
--- pve-installer/pve2/control	2011-08-04 10:16:15 UTC (rev 6417)
+++ pve-installer/pve2/control	2011-08-04 11:01:39 UTC (rev 6418)
@@ -1,5 +1,5 @@
 Package: pve-installer
-Version: 2.0-1
+Version: 2.0-2
 Section: utils
 Priority: optional
 Architecture: amd64

Modified: pve-installer/pve2/proxinstall
===================================================================
--- pve-installer/pve2/proxinstall	2011-08-04 10:16:15 UTC (rev 6417)
+++ pve-installer/pve2/proxinstall	2011-08-04 11:01:39 UTC (rev 6418)
@@ -49,6 +49,8 @@
 my $keymap = 'en-us';
 my $cmap;
 
+my $filesys = ($cmdline =~ m/\sext4(\s.*)$/) ? 'ext4' : 'ext3';
+
 my $postfix_main_cf = <<_EOD;
 # See /usr/share/postfix/main.cf.dist for a commented, more complete version
 
@@ -651,11 +653,11 @@
 
 	if ( -b $target_hd) {
 	    $bootdev = get_boot_part ($target_hd, $ptype eq 'gpt');
-	    create_filesystem ($bootdev, 'boot', 'ext4', 0.05, $maxper, 0, 0.1);
-	    create_filesystem ($rootdev, 'root', 'ext4', 0.05, $maxper, 0.1, 0.5);
-	    create_filesystem ($datadev, 'data', 'ext4', 0.05, $maxper, 0.5, 1, '-m 0');
+	    create_filesystem ($bootdev, 'boot', $filesys, 0.05, $maxper, 0, 0.1);
+	    create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0.1, 0.5);
+	    create_filesystem ($datadev, 'data', $filesys, 0.05, $maxper, 0.5, 1, '-m 0');
 	} else {
-	    create_filesystem ($rootdev, 'root', 'ext4', 0.05, $maxper, 0, 1);
+	    create_filesystem ($rootdev, 'root', $filesys, 0.05, $maxper, 0, 1);
 	}
 
 	update_progress (1, 0.05, $maxper, "mounting target $rootdev");
@@ -769,11 +771,11 @@
 
 	my $fstab = 
 	    "# <file system> <mount point> <type> <options> <dump> <pass>\n" .
-	    "$rootdev / ext4 errors=remount-ro 0 1\n";
+	    "$rootdev / $filesys errors=remount-ro 0 1\n";
 
-	$fstab .= "$datadev /var/lib/vz ext4 defaults 0 1\n" if $datadev;
+	$fstab .= "$datadev /var/lib/vz $filesys defaults 0 1\n" if $datadev;
 
-	$fstab .= "${boot_uuid} /boot ext4 defaults 0 1\n" if $boot_uuid;
+	$fstab .= "${boot_uuid} /boot $filesys defaults 0 1\n" if $boot_uuid;
 
 	$fstab .= "$swapfile none swap sw 0 0\n" if $swapfile;