more steps towards enabling xfs support based on patches from

Ajay Ramaswamy <xfs@ramaswamy.net>.  this set of changes adds the xfs
module and utilities to our various lists and makes 'linux xfs' have xfs
available

3 files changed, 31 insertions, 6 deletions

diff --git a/fsset.py b/fsset.py
index 6e9937f56..e56ebbc2d 100644
--- a/fsset.py
+++ b/fsset.py
@@ -397,9 +397,20 @@ class xfsFileSystem(FileSystemType):
         self.name = "xfs"
         self.maxSizeMB = 1024 * 1024
         self.maxLabelChars = 12
-        # we don't even have the module, so it won't be mountable... but
-        # just in case
-        self.supported = 0
+        # this is totally, 100% unsupported.  Boot with "linux xfs"
+        # at the boot: prompt will let you make new xfs filesystems
+        # in the installer.  Bugs filed when you use this will be closed
+        # WONTFIX.
+        try:
+            f = open("/proc/cmdline")
+            line = f.readline()
+            if string.find(line, " xfs") != -1:
+                self.supported = -1
+            else:
+                self.supported = 0
+            del f
+        except:
+            self.supported = 0
         
     def formatDevice(self, entry, progress, chroot='/'):
         devicePath = entry.device.setupDevice(chroot)
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 0afe48dbf..f67b411ca 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -92,7 +92,7 @@ LATEUSBMODS="mousedev usb-storage"
 IDEMODS="ide-cd"
 SCSIMODS="sd_mod sg sr_mod st"
 
-FSMODS="msdos vfat ext3 reiserfs jfs"
+FSMODS="msdos vfat ext3 reiserfs jfs xfs"
 SECSTAGE="agpgart md raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
 
 BTERMMODULES="vga16fb"
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index d3f8b1e45..fece7745e 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -110,7 +110,8 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt slang
 	 bzip2-libs dosfstools pciutils reiserfs-utils parted sed
 	 busybox-anaconda rpm-python booty hdparm lvm beecrypt
 	 rhpl pyxf86config libxml2 libxml2-python glib2
-	 elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils"
+	 elfutils-libelf bogl-bterm bogl krb5-libs convertdb1 jfsutils
+ 	 xfsprogs xfsdump dmapi libacl libattr attr acl"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES kernel-pcmcia-cs kernel-utils"
@@ -156,7 +157,8 @@ PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts
            redhat-config-keyboard Xft fontconfig redhat-artwork
            ttfonts-ja ttfonts-zh_TW bitmap-fonts-cjk urw-fonts 
            comps-extras XFree86-libs-data convertdb1
-           vnc-server libjpeg tcp_wrappers redhat-config-date"
+           vnc-server libjpeg tcp_wrappers redhat-config-date
+           xfsprogs xfsdump dmapi libacl libattr attr acl"
 
 #
 # stuff ONLY included for rescue mode
@@ -239,6 +241,9 @@ $LIBDIR/libresolv*
 $LIBDIR/librt[-.]*
 $LIBDIR/libss*
 $LIBDIR/libtermcap*
+$LIBDIR/libhandle*
+$LIBDIR/libattr*
+$LIBDIR/libdm*
 $LIBDIR/libutil*
 $LIBDIR/libuuid*
 sbin/badblocks
@@ -250,6 +255,8 @@ sbin/e2fsadm
 sbin/e2label
 sbin/fsck.ext2
 sbin/fsck.ext3
+sbin/fsck.jfs
+sbin/fsck.xfs
 sbin/fdisk
 sbin/hdparm
 sbin/hwclock
@@ -273,6 +280,7 @@ sbin/mke2fs
 sbin/mkfs.ext2
 sbin/mkfs.ext3
 sbin/mkfs.jfs
+sbin/mkfs.xfs
 sbin/mkfs.msdos
 sbin/mkfs.vfat
 sbin/mkreiserfs
@@ -290,6 +298,12 @@ sbin/probe
 sbin/resize2fs
 sbin/sfdisk
 sbin/tune2fs
+sbin/xfsdump
+sbin/xfsrestore
+sbin/xfs_repair
+usr/sbin/xfs_db
+usr/sbin/xfs_check
+usr/sbin/xfs_copy
 sbin/vgcfgbackup
 sbin/vgcfgrestore
 sbin/vgchange