Attachment 151924 Details for Bug 235612 – patch to upd-instroot to create petitboot initrd template

[patch] patch to upd-instroot to create petitboot initrd template

anaconda-generate-petitboot-root.patch (text/plain), 3.92 KB, created by David Woodhouse on 2007-04-07 23:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-07 23:58:31 UTC

Size: 3.92 KB

patch

obsolete

>? anaconda-generate-petitboot-root.patch
>? fish
>? scripts/upd-petitboot
>Index: scripts/upd-instroot
>===================================================================
>RCS file: /usr/local/CVS/anaconda/scripts/upd-instroot,v
>retrieving revision 1.544
>diff -u -p -r1.544 upd-instroot
>--- scripts/upd-instroot	23 Mar 2007 14:26:10 -0000	1.544
>+++ scripts/upd-instroot	7 Apr 2007 23:48:42 -0000
>@@ -14,9 +14,14 @@ if [ "$1" == "--nogr" ]; then
>     shift
> fi
> 
>+if [ "$1" == "--petitboot" ]; then
>+    NEEDPB=yes
>+    shift
>+fi
>+
> if [ -z "$1" ]; then
> 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
>-	echo "usage:        $0 <packagedir> [templatedir] [instroot]"
>+	echo "usage:        $0 <packagedir> [templatedir] [instroot] [petitroot]"
> 	exit 1
> fi
> 
>@@ -104,9 +109,16 @@ else
>     DESTGR=$3
> fi
> 
>+if [ -z "$4" ]; then
>+    DESTPB=${TMPDIR:-/tmp}/upd-petitroot
>+else
>+    DESTPB=$4
>+fi
>+
> rm -rf $DEST $DESTGR
> mkdir -p $DEST
> mkdir -p $DESTGR
>+mkdir -p $DESTPB
> 
> PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
> 	 libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt
>@@ -241,6 +253,13 @@ XORG="$XORGLIBS $XORGDRIVERS $XORGFONTS 
> PACKAGES="$PACKAGES $XORGDRIVERS"
> PACKAGESGR="$PACKAGESGR $XORG"
> 
>+# Packages needed for petitboot image
>+PACKAGESPB="glibc glibc-common busybox-anaconda libselinux libtwin petitboot udev libpng libjpeg kexec-tools ppc64-utils libsepol zlib"
>+
>+if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
>+    PACKAGESPB="$PACKAGESPB fbset ppc64-utils"
>+fi
>+
> 
> #
> # KEEPFILE is all files to keep from the packages in PACKAGES
>@@ -922,15 +941,52 @@ usr/share/grub/*
> EOF
> fi
> 
>+KEEPFILEPB=${TMPDIR:-/tmp}/keepfilepb.$$
>+cat > $KEEPFILEPB <<EOF
>+lib/ld*.so*
>+$LIBDIR/ld*.so*
>+$LIBDIR/libcrypt*
>+$LIBDIR/libc[-.]*
>+$LIBDIR/libm[-.]*
>+$LIBDIR/libselinux*
>+$LIBDIR/libsepol*
>+$LIBDIR/libcrypt*
>+$LIBDIR/libdl*
>+$LIBDIR/libz.so.*
>+lib/udev/*
>+etc/udev/*udev*
>+sbin/udevsettle
>+sbin/udevtrigger
>+sbin/udevd
>+sbin/kexec
>+sbin/other-os-flash-util
>+usr/bin/ps3videomode
>+sbin/boot-game-os
>+sbin/find-other-os-flash
>+etc/fb.modes
>+usr/sbin/fbset
>+usr/sbin/petitboot*
>+usr/sbin/udev-helper
>+usr/sbin/getctty
>+usr/$LIBDIR/libtwin.so.*
>+usr/share/petitboot/artwork/*
>+sbin/busybox.anaconda
>+usr/$LIBDIR/libjpeg.so.*
>+usr/$LIBDIR/libpng12.so.*
>+EOF
>+
> echo "Assembling package list..."
> RPMS=$(prunePackageList $PACKAGEDIR "$PACKAGES")
> [ -n "$DEBUG" ] && echo "RPMS are $RPMS"
> RPMSGR=$(prunePackageList $PACKAGEDIR "$PACKAGESGR $PACKAGESRESCUE")
> [ -n "$DEBUG" ] && echo "RPMSGR are $RPMSGR"
>+RPMSPB=$(prunePackageList $PACKAGEDIR "$PACKAGESPB")
>+[ -n "x$DEBUG" ] && echo "RPMSPB are $RPMSPB"
> 
> rm -rf $DEST; mkdir -p $DEST/usr/sbin
> rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib $DESTGR/boot
> ln -s /tmp $DESTGR/var/lib/xkb 
>+rm -rf $DESTPB; mkdir -p $DESTPB/sys $DESTPB/var/tmp/petitboot $DESTPB/dev $DESTPB/proc
> 
> #
> # concat KEEPFILEGR and KEEPFILERESCUE lists
>@@ -940,11 +996,26 @@ cat $KEEPFILERESCUE >> $KEEPFILEGR
> #
> # filter paths in keepfile lists for use by cpio
> #
>-for file in $KEEPFILE $KEEPFILEGR; do
>+for file in $KEEPFILE $KEEPFILEGR $KEEPFILEPB; do
>    cat $file | awk '{print $1 "\n./" $1}' > $file-
>    mv -f $file- $file
> done
> 
>+echo "Expanding petitboot packages..."
>+expandPackageSet "$RPMSPB" $DESTPB $KEEPFILEPB
>+
>+for a in \[ cat true false sh mount modprobe ls rm mkdir setkeycodes umount ifconfig fdisk dmesg cp mknod echo ; do
>+    ln -sf busybox.anaconda $DESTPB/sbin/$a
>+done
>+ln -sf sbin $DESTPB/bin
>+ln -sf usr/sbin/petitboot-init $DESTPB/init
>+cat > $DESTPB/etc/filesystems <<EOF
>+hfs
>+vfat
>+ext2
>+ext3
>+EOF
>+
> echo "Expanding text packages..."
> expandPackageSet "$RPMS" $DEST $KEEPFILE
> 
>@@ -1135,7 +1206,7 @@ if [ -n "$NEEDGR" ]; then
>     /usr/sbin/chroot $DESTGR /usr/bin/gtk-update-icon-cache -q -f /usr/share/icons/Bluecurve
> fi
> 
>-rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE
>+rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE $KEEPFILEPB
> 
> for p in $DEST $DESTGR; do
> 	echo "Scrubbing trees..." "$p"

Actions: View | Diff

Attachments on bug 235612: 151924 | 152087 | 152149 | 152193