From 770be38f0cd1e50b049498b76f543ab7a9b9a900 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Wed, 22 Apr 2020 15:44:35 -0400
Subject: [PATCH 1/2] Support xfs filesystem for statelite images

---
 .../share/xcat/netboot/add-on/statelite/rc.localdisk      | 8 ++++----
 .../share/xcat/netboot/rh/dracut_047/install.netboot      | 2 +-
 .../share/xcat/netboot/rh/dracut_047/install.statelite    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
index 7676e73ce..7d78fc847 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
@@ -212,18 +212,18 @@ doconfigure () {
 
             # create the filesystem
             if [ x$fstype = x ]; then
-                fstype=ext3
+                fstype=ext4
             fi
             partnum=`expr $partnum + 1`
             partdev=$dev$partnum
             echo "Create filesystem $fstype on $partdev" >>$LOG
-            echo "mke2fs -q $partdev -t $fstype" >>$LOG
-            `mke2fs -q $partdev -t $fstype > /dev/null`
+            echo "mkfs.$fstype -q $partdev" >>$LOG
+            `mkfs.$fstype -q $partdev  > /dev/null`
             sleep 1
         done
     elif [ $localspace -eq 1 ]; then
         if [ x$fstype = x ]; then
-            fstype=ext3
+            fstype=ext4
         fi
         echo "Mount $dev to $LOCAL with $fstype" >>$LOG
         echo "mount -t $fstype $dev $MNTDIR$LOCAL" >>$LOG
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_047/install.netboot b/xCAT-server/share/xcat/netboot/rh/dracut_047/install.netboot
index 5ac651c5f..422138e65 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_047/install.netboot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_047/install.netboot
@@ -3,7 +3,7 @@ echo $drivers
 dracut_install curl tar cpio gzip modprobe touch echo cut wc xz
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
 dracut_install mount.nfs
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 dracut_install ethtool
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_047/install.statelite b/xCAT-server/share/xcat/netboot/rh/dracut_047/install.statelite
index 36929bf89..8d7413778 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_047/install.statelite
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_047/install.statelite
@@ -2,7 +2,7 @@
 echo $drivers
 dracut_install curl cpio gzip modprobe wc touch echo cut
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 dracut_install ethtool
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst_hook pre-mount 5 "$moddir/xcat-premount.sh"

From e22130a46bc4d9c36edf54cb9acf5cf9328e7653 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Thu, 23 Apr 2020 12:35:49 -0400
Subject: [PATCH 2/2] add mkfs.xfs to older version of dracut

---
 xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk  | 4 ++--
 xCAT-server/share/xcat/netboot/rh/dracut/install.netboot      | 2 +-
 xCAT-server/share/xcat/netboot/rh/dracut/install.statelite    | 2 +-
 xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot  | 2 +-
 .../share/xcat/netboot/rh/dracut_033/install.statelite        | 2 +-
 .../share/xcat/netboot/sles/dracut_033/install.netboot        | 2 +-
 .../share/xcat/netboot/sles/dracut_033/install.statelite      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
index 7d78fc847..73a1f7e83 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
@@ -217,8 +217,8 @@ doconfigure () {
             partnum=`expr $partnum + 1`
             partdev=$dev$partnum
             echo "Create filesystem $fstype on $partdev" >>$LOG
-            echo "mkfs.$fstype -q $partdev" >>$LOG
-            `mkfs.$fstype -q $partdev  > /dev/null`
+            echo "mkfs.$fstype -f -q $partdev" >>$LOG
+            `mkfs.$fstype -f -q $partdev  > /dev/null`
             sleep 1
         done
     elif [ $localspace -eq 1 ]; then
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot b/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
index dd6fb9a6b..9b5da98ff 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
@@ -4,7 +4,7 @@ dracut_install wget tar cpio gzip dash modprobe touch echo cut wc xz
 dracut_install -o ctorrent
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
 dracut_install mount.nfs
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
 inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/install.statelite b/xCAT-server/share/xcat/netboot/rh/dracut/install.statelite
index b8bf69a46..df2bf5bc4 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut/install.statelite
+++ b/xCAT-server/share/xcat/netboot/rh/dracut/install.statelite
@@ -3,7 +3,7 @@ echo $drivers
 dracut_install wget tar cpio gzip dash modprobe wc touch echo cut
 dracut_install -o ctorrent
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst_hook pre-mount 5 "$moddir/xcat-premount.sh"
 inst_hook pre-pivot 5 "$moddir/xcat-prepivot.sh"
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
index 2a62a66c6..b6be1168b 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
@@ -3,7 +3,7 @@ echo $drivers
 dracut_install wget tar cpio gzip modprobe touch echo cut wc xz
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
 dracut_install mount.nfs
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 dracut_install ethtool
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.statelite b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.statelite
index 07e24fee4..8ded72c3c 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.statelite
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.statelite
@@ -2,7 +2,7 @@
 echo $drivers
 dracut_install wget cpio gzip modprobe wc touch echo cut
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db 
 dracut_install ethtool
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst_hook pre-mount 5 "$moddir/xcat-premount.sh"
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
index d98aa6c54..7fad93458 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
@@ -3,7 +3,7 @@ echo $drivers
 dracut_install wget tar cpio gzip modprobe touch echo cut wc xz
 dracut_install grep ifconfig ip hostname awk egrep grep dirname expr
 dracut_install mount.nfs
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
 inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.statelite b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.statelite
index ccbdc49cf..f63f58b18 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.statelite
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.statelite
@@ -2,7 +2,7 @@
 echo $drivers
 dracut_install wget cpio gzip modprobe wc touch echo cut
 dracut_install grep ifconfig ip hostname awk egrep grep dirname expr logger
-dracut_install parted mke2fs bc mkswap swapon chmod
+dracut_install parted mke2fs bc mkswap swapon chmod mkfs mkfs.ext4 mkfs.xfs xfs_db
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst_hook pre-mount 5 "$moddir/xcat-premount.sh"
 inst_hook pre-pivot 5 "$moddir/xcat-prepivot.sh"