Menu
▾
▴
[systemimager-commits] r4552 - in branches/4.2.x: . doc/man doc/manual_source etc lib/SystemImager make.d sbin
|
From: <bl...@sy...> - 2011-04-13 18:02:14
|
Author: bli
Date: 2011-04-13 13:02:08 -0500 (Wed, 13 Apr 2011)
New Revision: 4552
Modified:
branches/4.2.x/CREDITS
branches/4.2.x/doc/man/autoinstallscript.conf.content.sgml
branches/4.2.x/doc/manual_source/usage.sgml
branches/4.2.x/etc/autoinstallscript.template
branches/4.2.x/etc/client.conf
branches/4.2.x/lib/SystemImager/Common.pm
branches/4.2.x/lib/SystemImager/Server.pm
branches/4.2.x/make.d/e2fsprogs.rul
branches/4.2.x/sbin/si_getimage
Log:
Merge r4490, r4497, r4498 from trunk to 4.2.x branch to support ext4:
r4490:
* Upgrade e2fsprogs from v1.40.2 to v1.41.12
r4497:
* Handle ext4.
r4498:
* Handle ext4.
Modified: branches/4.2.x/CREDITS
===================================================================
--- branches/4.2.x/CREDITS 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/CREDITS 2011-04-13 18:02:08 UTC (rev 4552)
@@ -1,7 +1,7 @@
#
# "SystemImager"
#
-# Copyright (C) 1999-2006 Brian Elliott Finley
+# Copyright (C) 1999-2010 Brian Elliott Finley
#
# $Id$
#
Modified: branches/4.2.x/doc/man/autoinstallscript.conf.content.sgml
===================================================================
--- branches/4.2.x/doc/man/autoinstallscript.conf.content.sgml 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/doc/man/autoinstallscript.conf.content.sgml 2011-04-13 18:02:08 UTC (rev 4552)
@@ -7,7 +7,7 @@
&dhsurname;
</author>
<copyright>
- <year>2002</year>
+ <year>2002-2010</year>
<holder>&dhusername;</holder>
</copyright>
&dhdate;
@@ -355,7 +355,7 @@
fs - The third field in the fstab file. This is where you specify what
filesystem you want created on the partition specified on "mount_dev"
(or "real_dev"). Valid filesystem types supported by SystemImager are:
- ext2, ext3, msdos, reiserfs, vfat, jfs, xfs
+ ext2, ext3, ext4, msdos, reiserfs, vfat, jfs, xfs
</para>
</listitem>
Modified: branches/4.2.x/doc/manual_source/usage.sgml
===================================================================
--- branches/4.2.x/doc/manual_source/usage.sgml 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/doc/manual_source/usage.sgml 2011-04-13 18:02:08 UTC (rev 4552)
@@ -279,7 +279,7 @@
#
# "SystemImager"
#
-# Copyright (C) 1999-2002 Bald Guy Software <bri...@ba...>
+# Copyright (C) 1999-2010 Brian Elliott Finley
#
# This file is: /local.cfg
#
@@ -332,7 +332,7 @@
which contains the list of mounted filesystems and their mount
points. <command>si_getimage</command> pulls out the mount points for the filesystems that
are unsupported and creates an exclusion list. The filesystems
- SystemImager currently supports ext2, ext3, reiserfs, xfs, jfs and
+ SystemImager currently supports ext2, ext3, ext4, reiserfs, xfs, jfs and
vfat. All other filesytems will be ignored, including proc, nfs,
devpts, iso9660, etc.
</para>
@@ -775,7 +775,7 @@
file, which contains the list of mounted filesystems and the devices on which they are
mounted. It pulls out the mount points for the filesystems that are unsupported and
creates an exclusion list. Currently supported filesystems are ext2,
- ext3, and reiserfs.
+ ext3, ext4, and reiserfs.
All other filesystems are unsupported, including proc,
devpts, iso9660, etc.
</para>
Modified: branches/4.2.x/etc/autoinstallscript.template
===================================================================
--- branches/4.2.x/etc/autoinstallscript.template 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/etc/autoinstallscript.template 2011-04-13 18:02:08 UTC (rev 4552)
@@ -5,7 +5,7 @@
# $Id$
# vi:set filetype=sh:
#
-# Copyright (C) 1999-2006 Brian Elliott Finley
+# Copyright (C) 1999-2010 Brian Elliott Finley
#
# 28.07.2005 Erich Focht : SCSI device detection and generation of
# /a/etc/systemconfig/hardware.lst
@@ -186,6 +186,7 @@
logmsg "Load additional filesystem drivers."
modprobe ext2
modprobe ext3
+modprobe ext4
modprobe fat
modprobe jfs
modprobe reiserfs
Modified: branches/4.2.x/etc/client.conf
===================================================================
--- branches/4.2.x/etc/client.conf 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/etc/client.conf 2011-04-13 18:02:08 UTC (rev 4552)
@@ -1,7 +1,7 @@
#
# "SystemImager"
#
-# Copyright (C) 2002 Bald Guy Software <bri...@ba...>
+# Copyright (C) 2002-2010 Brian Elliott Finley
#
# $Id$
#
@@ -15,6 +15,7 @@
#
fstype = ext2
fstype = ext3
+fstype = ext4
fstype = reiserfs
fstype = dosfs
fstype = vfat
Modified: branches/4.2.x/lib/SystemImager/Common.pm
===================================================================
--- branches/4.2.x/lib/SystemImager/Common.pm 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/lib/SystemImager/Common.pm 2011-04-13 18:02:08 UTC (rev 4552)
@@ -469,10 +469,10 @@
#
# "help mkfs"
#
- my $fs_regex = '(ext3|ext2|fat32|fat16|hfs|jfs|linux-swap|ntfs|reiserfs|hp-ufs|sun-ufs|xfs)\s*';
+ my $fs_regex = '(ext4|ext3|ext2|fat32|fat16|hfs|jfs|linux-swap|ntfs|reiserfs|hp-ufs|sun-ufs|xfs)\s*';
#
- # fs_regex arguments taken from parted on RHEL4. For more info on
+ # flag_regex arguments taken from parted on RHEL4. For more info on
# flags that parted uses, just start parted in interactive mode,
# and do this:
#
Modified: branches/4.2.x/lib/SystemImager/Server.pm
===================================================================
--- branches/4.2.x/lib/SystemImager/Server.pm 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/lib/SystemImager/Server.pm 2011-04-13 18:02:08 UTC (rev 4552)
@@ -1,7 +1,7 @@
#
# "SystemImager"
#
-# Copyright (C) 1999-2006 Brian Elliott Finley
+# Copyright (C) 1999-2010 Brian Elliott Finley
#
# $Id$
#
@@ -1353,11 +1353,14 @@
print $out "\n";
- # ext2
- } elsif ( $xml_config->{fsinfo}->{$line}->{fs} eq "ext2" ) {
-
+ # ext2,ext3,ext4
+ } elsif (
+ ( $xml_config->{fsinfo}->{$line}->{fs} eq "ext2" )
+ or ( $xml_config->{fsinfo}->{$line}->{fs} eq "ext3" )
+ or ( $xml_config->{fsinfo}->{$line}->{fs} eq "ext4" )
+ ) {
# create fs
- $cmd = "mke2fs -q $real_dev || shellout";
+ $cmd = "mke2fs -q -t $xml_config->{fsinfo}->{$line}->{fs} $real_dev || shellout";
print $out qq(logmsg "$cmd"\n);
print $out "$cmd\n";
@@ -1395,48 +1398,6 @@
print $out "\n";
- # ext3
- } elsif ( $xml_config->{fsinfo}->{$line}->{fs} eq "ext3" ) {
-
- # create fs
- $cmd = "mke2fs -q -j $real_dev || shellout";
- print $out qq(logmsg "$cmd"\n);
- print $out "$cmd\n";
-
- if ($mount_dev) {
- # add LABEL if necessary
- if ($mount_dev =~ /LABEL=/) {
- my $label = $mount_dev;
- $label =~ s/LABEL=//;
-
- $cmd = "tune2fs -L $label $real_dev";
- print $out qq(logmsg "$cmd"\n);
- print $out "$cmd\n";
- }
-
- # add UUID if necessary
- if ($mount_dev =~ /UUID=/) {
- my $uuid = $mount_dev;
- $uuid =~ s/UUID=//;
-
- $cmd = "tune2fs -U $uuid $real_dev";
- print $out qq(logmsg "$cmd"\n);
- print $out "$cmd\n";
- }
- }
-
- # mkdir
- $cmd = "mkdir -p /a$mp || shellout";
- print $out qq(logmsg "$cmd"\n);
- print $out "$cmd\n";
-
- # mount
- $cmd = "mount $real_dev /a$mp -t $fs -o $options || shellout";
- print $out qq(logmsg "$cmd"\n);
- print $out "$cmd\n";
-
- print $out "\n";
-
# reiserfs
} elsif ( $xml_config->{fsinfo}->{$line}->{fs} eq "reiserfs" ) {
@@ -1728,8 +1689,9 @@
# Don't include in hash below unless it's a supported filesystem. -BEF-
#
unless(
- ($fs eq "ext2")
+ ($fs eq "ext2")
or ($fs eq "ext3")
+ or ($fs eq "ext4")
or ($fs eq "reiserfs")
or ($fs eq "msdos")
or ($fs eq "vfat")
Modified: branches/4.2.x/make.d/e2fsprogs.rul
===================================================================
--- branches/4.2.x/make.d/e2fsprogs.rul 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/make.d/e2fsprogs.rul 2011-04-13 18:02:08 UTC (rev 4552)
@@ -1,9 +1,14 @@
#
# $Id$
#
-E2FSPROGS_VERSION := 1.40.2
+# 2010.06.14 Brian Elliott Finley
+# * Upgrade from v1.40.2 to v1.41.12
+#
+
+E2FSPROGS_VERSION := 1.41.12
E2FSPROGS_DIR := e2fsprogs-$(E2FSPROGS_VERSION)
E2FSPROGS_TARBALL := e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+#E2FSPROGS_URL := http://prdownloads.sourceforge.net/e2fsprogs/$(E2FSPROGS_TARBALL)
E2FSPROGS_URL := http://download.systemimager.org/pub/e2fsprogs/$(E2FSPROGS_TARBALL)
E2FSPROGS_PATCH := $(PATCH_DIR)/e2fsprogs.patch
MKE2FS_BINARY := $(SRC_DIR)/$(E2FSPROGS_DIR)/misc/mke2fs
Modified: branches/4.2.x/sbin/si_getimage
===================================================================
--- branches/4.2.x/sbin/si_getimage 2011-04-12 23:39:54 UTC (rev 4551)
+++ branches/4.2.x/sbin/si_getimage 2011-04-13 18:02:08 UTC (rev 4552)
@@ -3,7 +3,7 @@
#
# "SystemImager"
#
-# Copyright (C) 1999-2004 Brian Elliott Finley
+# Copyright (C) 1999-2010 Brian Elliott Finley
#
# $Id$
#
@@ -229,8 +229,8 @@
$warning = <<"EOF";
This program will get the \"$image\" system image from \"$source_host\"
-making the assumption that all filesystems considered part
-of the system image are using ext2, ext3, jfs, FAT, reiserfs, or xfs.
+making the assumption that all filesystems considered part of the
+system image are using ext2, ext3, ext4, jfs, FAT, reiserfs, or xfs.
This program will not get /proc, NFS, or other filesystems
not mentioned above.
@@ -388,6 +388,7 @@
open (FINAL_EXCLUDE_FILE, ">$file") || die "$program_name: Couldn't open $file for writing!\n";
@mounted_filesystems = grep (!/\s+ext2\s+/, @mounted_filesystems);
@mounted_filesystems = grep (!/\s+ext3\s+/, @mounted_filesystems);
+ @mounted_filesystems = grep (!/\s+ext4\s+/, @mounted_filesystems);
@mounted_filesystems = grep (!/\s+reiserfs\s+/, @mounted_filesystems);
@mounted_filesystems = grep (!/\s+jfs\s+/, @mounted_filesystems);
@mounted_filesystems = grep (!/\s+xfs\s+/, @mounted_filesystems);
|