[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Update upd-bootiso for F16



NOTE: Untested, maybe someone with a rawhide.iso could give this a try
---
 scripts/upd-bootiso |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/scripts/upd-bootiso b/scripts/upd-bootiso
index 450511b..6aaed0d 100755
--- a/scripts/upd-bootiso
+++ b/scripts/upd-bootiso
@@ -161,8 +161,26 @@ popd
 # From f12 to f14 it was images/install.img
 # After f14 it is all in isolinux/initrd.img
 
-if [ $VER -gt 14 ]; then
-    echo "Detected anaconda release 15+"
+if [ $VER -gt 15 ]; then
+    echo "Detected anaconda release 16+"
+    # Do f16 and later operations on ./newinitrd
+    pushd ./newinitrd
+    unpackRPMs
+
+    cp ./usr/share/anaconda/raidstart-stub ./usr/bin/raidstart
+    cp ./usr/share/anaconda/raidstop-stub ./usr/bin/raidstop
+    cp ./usr/share/anaconda/list-harddrives-stub ./usr/bin/list-harddrives
+    cp ./usr/share/anaconda/loadkeys-stub ./usr/bin/loadkeys
+    cp ./usr/$LIBDIR/python?.?/site-packages/pyanaconda/sitecustomize.py ./usr/$LIBDIR/python?.?/site-packages
+
+    # Copy loader to the initrd
+    cp ./usr/$LIBDIR/anaconda/loader ../newinitrd/sbin/
+    cp ./usr/share/anaconda/loader.tr ../newinitrd/etc/
+
+    # non-standard, used for debugging stage1 problems
+    cp ./usr/bin/{ls,cat,less} ../newinitrd/sbin/
+elif [ $VER -gt 14 ]; then
+    echo "Detected anaconda release 15"
     # Do f15 and later operations on ./newinitrd
     pushd ./newinitrd
     unpackRPMs
@@ -249,7 +267,11 @@ fi
 
 # Create the new initrd.img
 pushd ./newinitrd
-find . |cpio --quiet -c -o | gzip -9 > ../initrd.img
+if [ $VER -gt 15 ]; then
+    find . |cpio --quiet -c -o | xz -9 --check=crc32 > ../initrd.img
+else
+    find . |cpio --quiet -c -o | gzip -9 > ../initrd.img
+fi
 popd
 
 # Stuff new initrd.img into the newiso tree
-- 
1.7.4.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]