kadischi/livecd_generator install-boot.sh, 1.1.1.1, 1.2 kadischi.py, 1.4, 1.5 livecd-mkinitrd.sh, 1.3, 1.4
Jasper O'neal Hartline (autopsy)
fedora-extras-commits at redhat.com
Fri Mar 17 22:30:02 UTC 2006
Author: autopsy
Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/livecd_generator
Modified Files:
install-boot.sh kadischi.py livecd-mkinitrd.sh
Log Message:
Kadischi transitional fixes(FC4->FC5), standard bootsplash support
Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- install-boot.sh 21 Aug 2005 17:09:00 -0000 1.1.1.1
+++ install-boot.sh 17 Mar 2006 22:30:00 -0000 1.2
@@ -3,18 +3,63 @@
sysdir=$1
csysdir=$2
kernel=$3
+kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0)
+kernel_version_proper=$(echo $kernel | sed -e 's|xen0||')
+kernel_params=''
+
+ . /etc/kadischi/build.conf
+
+if [ -x $sysdir/usr/bin/rhgb ]; then
+ kernel_params="$kernel_params rhgb"
+fi
cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/isolinux/initrd.img
cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
+
+if [ ! $kernel_is_xen ]; then
+cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
default linux
prompt 1
+display boot.msg
timeout 600
+F1 boot.msg
+F2 options.msg
+F3 general.msg
+F4 license.msg
label linux
kernel vmlinuz
- append initrd=initrd.img ramdisk_size=10000
-label test
+ append initrd=initrd.img quiet $kernel_params
+label debug
kernel vmlinuz
- append initrd=initrd.img INITRD_DBG=x ramdisk_size=10000
-_EOF_
\ No newline at end of file
+ append initrd=initrd.img INITRD_DBG=x
+label memtest86
+ kernel memtest
+ append -
+_EOF_
+else
+cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
+cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz
+cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/
+cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
+default linux
+prompt 1
+display xenboot.msg
+timeout 600
+F1 xenboot.msg
+F2 options.msg
+F3 general.msg
+F4 license.msg
+F5 xen.msg
+label linux
+ kernel mboot.c32
+ append xen.gz nosmp noacpi --- vmlinuz --- initrd.img quiet $kernel_params
+label debug
+ kernel mboot.c32
+ append xen.gz nosmp noacpi noreboot --- vmlinuz --- initrd.img INITRD_DBG=x
+label memtest86
+ kernel memtest
+ append -
+_EOF_
+fi
Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kadischi.py 13 Oct 2005 01:05:48 -0000 1.4
+++ kadischi.py 17 Mar 2006 22:30:00 -0000 1.5
@@ -32,7 +32,7 @@
# process command line options
-usage = 'usage: %prog [options] <path-to-the-repository> <destination-iso-image-file>\n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/KadischiDoc'
+usage = 'usage: %prog [options] <path-to-the-repository> <destination-iso-image-file>\n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/Kadischi/Documentation'
version = '%prog ' + version
parser = optparse.OptionParser (usage=usage, version=version)
@@ -177,7 +177,7 @@
# load config file options
-flc_log ('Loadnig config file options')
+flc_log ('Loading config file options')
buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True)
builddir = buildconf ["BUILDDIR"]
@@ -221,7 +221,7 @@
flc_log ('\n *** running anaconda *** \n')
-run ("anaconda %s --rootpath=%s --method=%s --livecd" % (anaconda_args, sysdir, method), builddir)
+run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir)
flc_log ('\n *** anaconda has finished the job *** \n')
@@ -292,4 +292,4 @@
cleanup (builddir)
flc_log ('Finished.')
-sys.exit (0)
\ No newline at end of file
+sys.exit (0)
Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- livecd-mkinitrd.sh 13 Mar 2006 02:22:12 -0000 1.3
+++ livecd-mkinitrd.sh 17 Mar 2006 22:30:00 -0000 1.4
@@ -200,16 +200,16 @@
mkdir -p $MNTIMAGE/lib
mkdir -p $MNTIMAGE/lib/tls
-mkdir -p $MNTIMAGE/lib/obsolete/linuxthreads
mkdir -p $MNTIMAGE/lib/modules/$kernel
mkdir -p $MNTIMAGE/bin
mkdir -p $MNTIMAGE/etc
+mkdir -p $MNTIMAGE/etc/modprobe.d
mkdir -p $MNTIMAGE/dev
mkdir -p $MNTIMAGE/proc
mkdir -p $MNTIMAGE/sys
mkdir -p $MNTIMAGE/sysroot
mkdir -p $MNTIMAGE/tmp
-mkdir -p $MNTIMAGE/usr/share/hwdata
+mkdir -p $MNTIMAGE/usr/lib
mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs
ln -s bin $MNTIMAGE/sbin
@@ -219,19 +219,19 @@
inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2"
inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1"
inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1"
+inst $rootdir/lib/libdl.so.2 "$MNTIMAGE/lib/libdl.so.2"
if [ -f $rootdir/lib/tls/libc.so.6 ]; then
inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
else
- inst $rootdir/lib/obsolete/linuxthreads/libc.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libc.so.6"
- ln -s "/lib/obsolete/linuxthreads/libc.so.6" "$MNTIMAGE/lib/libc.so.6"
+ inst $rootdir/lib/libc.so.6 "$MNTIMAGE/lib/libc.so.6"
fi
if [ -f $rootdir/lib/tls/libm.so.6 ]; then
inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
else
- inst $rootdir/lib/obsolete/linuxthreads/libm.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libm.so.6"
- ln -s "/lib/obsolete/linuxthreads/libm.so.6" "$MNTIMAGE/lib/libm.so.6"
+ inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
+ ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
fi
inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox"
@@ -252,8 +252,7 @@
inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV"
fi
-inst $rootdir/usr/share/hwdata/pcitable "$MNTIMAGE/usr/share/hwdata/pcitable"
-inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist"
+inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
PPMODULES=$(findmodules drivers/parport)
More information about the fedora-extras-commits
mailing list