kadischi/livecd_generator create-iso.sh, 1.3, 1.4 install-boot.sh, 1.5, 1.6 kadischi.py, 1.11, 1.12 livecd-mkinitrd.sh, 1.9, 1.10 movefiles.py, 1.3, 1.4
Jasper O'neal Hartline (autopsy)
fedora-extras-commits at redhat.com
Mon May 22 05:36:40 UTC 2006
Author: autopsy
Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8126/kadischi/livecd_generator
Modified Files:
create-iso.sh install-boot.sh kadischi.py livecd-mkinitrd.sh
movefiles.py
Log Message:
Allow building using sudo or su from user accounts
Index: create-iso.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- create-iso.sh 11 Apr 2006 08:26:22 -0000 1.3
+++ create-iso.sh 22 May 2006 05:36:38 -0000 1.4
@@ -3,4 +3,4 @@
sysdir=$1
isoimage=$2
-mkisofs -quiet -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir
+/usr/bin/mkisofs -quiet -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir
Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- install-boot.sh 17 May 2006 19:10:21 -0000 1.5
+++ install-boot.sh 22 May 2006 05:36:38 -0000 1.6
@@ -3,14 +3,14 @@
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_is_xen=$(echo $kernel | /bin/grep -G [[:alnum:]]xen0)
+kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||')
kernel_params='selinux=0'
. /etc/kadischi/kadischi.conf
nobootsplash() {
- cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
+ /bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
default linux
prompt 1
timeout 600
@@ -30,18 +30,18 @@
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/
+/bin/cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/isolinux/initrd.img
+/bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
+/bin/cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
if [ ! $kernel_is_xen ]; then
if [ -d $INSTALLDIR/bootsplash ]; then
- cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
+ /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
else
echo "Nothing found for bootsplashing."
nobootsplash
fi
-cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
+/bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
default linux
prompt 1
display boot.msg
@@ -62,14 +62,14 @@
_EOF_
else
if [ -d $INSTALLDIR/bootsplash ]; then
- cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
+ /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
else
echo "Nothing found for bootsplashing."
nobootsplash
fi
-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_
+/bin/cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz
+/bin/cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/
+/bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
default linux
prompt 1
display xenboot.msg
Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kadischi.py 11 Apr 2006 08:26:22 -0000 1.11
+++ kadischi.py 22 May 2006 05:36:38 -0000 1.12
@@ -208,7 +208,7 @@
# run anaconda
flc_log ('\n *** running anaconda *** \n')
-run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir)
+run ("/usr/sbin/anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir)
flc_log ('\n *** anaconda has finished the job *** \n')
@@ -252,7 +252,7 @@
touch = file(normalize_path([csysdir, '.livecd']), 'w')
touch.close()
# Make the SquashFS image
-run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
+run("/sbin/mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
# install boot & conf files in compressed tree (they shoudn`t be compressed)
Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- livecd-mkinitrd.sh 17 May 2006 19:10:21 -0000 1.9
+++ livecd-mkinitrd.sh 22 May 2006 05:36:38 -0000 1.10
@@ -36,7 +36,7 @@
findmodules() {
cd $rootdir/lib/modules/$kernel
for dir in $@; do
- find kernel/$dir -name *.ko -o -name *.o -o -name *.o.gz
+ /usr/bin/find kernel/$dir -name *.ko -o -name *.o -o -name *.o.gz
done
}
@@ -51,7 +51,7 @@
dir=$(dirname $dest)
if [ ! -d $dir ]; then
- mkdir -p $dir
+ /bin/mkdir -p $dir
fi
if [ -x /usr/bin/strip ]; then
@@ -126,11 +126,11 @@
fi
if [ ! -d $rootdir/$imagedir ]; then
- mkdir $rootdir/$imagedir
+ /bin/mkdir $rootdir/$imagedir
fi
if [ ! -d $rootdir/initrd ]; then
- mkdir $rootdir/initrd
+ /bin/mkdir $rootdir/initrd
fi
if [ ! -d $rootdir/lib/modules/$kernel ]; then
@@ -151,9 +151,9 @@
exit 1
fi
-MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX`
-IMAGE=`mktemp ${TMPDIR}/initrd.img.XXXXXX`
-MNTPOINT=`mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX`
+MNTIMAGE=`/bin/mktemp -d ${TMPDIR}/initrd.XXXXXX`
+IMAGE=`/bin/mktemp ${TMPDIR}/initrd.img.XXXXXX`
+MNTPOINT=`/bin/mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX`
RCFILE=$MNTIMAGE/linuxrc
if [ -z "$MNTIMAGE" -o -z "$IMAGE" -o -z "$MNTPOINT" ]; then
@@ -162,60 +162,60 @@
fi
if [ ! -e /dev/zero ]; then
- mknod /dev/zero c 1 5
+ /bin/mknod /dev/zero c 1 5
fi
for i in `/usr/bin/seq 0 9`; do
if [ ! -e /dev/loop$i ]; then
- mknod /dev/loop$i b 7 $i
+ /bin/mknod /dev/loop$i b 7 $i
fi
done
-dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1
+/bin/dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1
LODEV=$(losetup -f)
if [ -z "$LODEV" ]; then
- rm -rf $MNTIMAGE $MNTPOINT $IMAGE
+ /bin/rm -rf $MNTIMAGE $MNTPOINT $IMAGE
echo "All of your loopback devices are in use." >&2
exit 1
fi
-losetup ${LODEV} $IMAGE || exit 1
+/sbin/losetup ${LODEV} $IMAGE || exit 1
# We have to "echo y |" so that it doesn't complain about $IMAGE not
# being a block device
-echo y | mke2fs $LODEV $IMAGESIZE >/dev/null 2>/dev/null
-tune2fs -i0 $LODEV >/dev/null
+echo y | /sbin/mke2fs $LODEV $IMAGESIZE >/dev/null 2>/dev/null
+/sbin/tune2fs -i0 $LODEV >/dev/null
if [ -n "$verbose" ]; then
echo "Using loopback device $LODEV"
fi
-mkdir -p $MNTPOINT
-mount -t ext2 $LODEV $MNTPOINT || {
+/bin/mkdir -p $MNTPOINT
+/bin/mount -t ext2 $LODEV $MNTPOINT || {
echo "Can't get a loopback device"
exit 1
}
-mkdir -p $MNTIMAGE/lib
-mkdir -p $MNTIMAGE/lib/tls
-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/cdrom
-mkdir -p $MNTIMAGE/tmp
-mkdir -p $MNTIMAGE/usr/lib
-mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs
-ln -s bin $MNTIMAGE/sbin
+/bin/mkdir -p $MNTIMAGE/lib
+/bin/mkdir -p $MNTIMAGE/lib/tls
+/bin/mkdir -p $MNTIMAGE/lib/modules/$kernel
+/bin/mkdir -p $MNTIMAGE/bin
+/bin/mkdir -p $MNTIMAGE/etc
+/bin/mkdir -p $MNTIMAGE/etc/modprobe.d
+/bin/mkdir -p $MNTIMAGE/dev
+/bin/mkdir -p $MNTIMAGE/proc
+/bin/mkdir -p $MNTIMAGE/sys
+/bin/mkdir -p $MNTIMAGE/sysroot
+/bin/mkdir -p $MNTIMAGE/cdrom
+/bin/mkdir -p $MNTIMAGE/tmp
+/bin/mkdir -p $MNTIMAGE/usr/lib
+/bin/mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs
+/bin/ln -s bin $MNTIMAGE/sbin
# We don't need this directory, so let's save space
-rm -rf $MNTPOINT/lost+found
+/bin/rm -rf $MNTPOINT/lost+found
inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2"
inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1"
@@ -232,12 +232,12 @@
inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
else
inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6"
- ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
+ /bin/ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
fi
inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox"
for i in [ ash awk cat cut echo grep ifconfig ls lsmod mount pivot_root rmmod route sh sort umount sleep; do
- ln -s busybox "$MNTIMAGE/bin/$i"
+ /bin/ln -s busybox "$MNTIMAGE/bin/$i"
done
inst $INSTALLDIR/initrd/find-live-cd "$MNTIMAGE/bin/find-live-cd"
@@ -267,29 +267,29 @@
# mknod'ing the devices instead of copying them works both with and
# without devfs...
-mknod $MNTIMAGE/dev/console c 5 1
-mknod $MNTIMAGE/dev/null c 1 3
-mknod $MNTIMAGE/dev/ram b 1 1
-mknod $MNTIMAGE/dev/systty c 4 0
+/bin/mknod $MNTIMAGE/dev/console c 5 1
+/bin/mknod $MNTIMAGE/dev/null c 1 3
+/bin/mknod $MNTIMAGE/dev/ram b 1 1
+/bin/mknod $MNTIMAGE/dev/systty c 4 0
for i in 1 2 3 4; do
- mknod $MNTIMAGE/dev/tty$i c 4 $i
+ /bin/mknod $MNTIMAGE/dev/tty$i c 4 $i
done
for i in 0 1 2 3 4 5 6 7 8 9; do
- mknod $MNTIMAGE/dev/loop$i b 7 $i
+ /bin/mknod $MNTIMAGE/dev/loop$i b 7 $i
done
inst $INSTALLDIR/initrd/livecd-linuxrc "$MNTIMAGE/linuxrc"
-(cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) || exit 1
+(cd $MNTIMAGE; /bin/tar cf - .) | (cd $MNTPOINT; /bin/tar xf -) || exit 1
-umount $MNTPOINT
-losetup -d $LODEV
+/bin/umount $MNTPOINT
+/sbin/losetup -d $LODEV
if [ -n "$compress" ]; then
- gzip -9 < $IMAGE > $rootdir/$imagedir/$image || rc=1
+ /bin/gzip -9 < $IMAGE > $rootdir/$imagedir/$image || rc=1
else
- cp -a $IMAGE $rootdir/$imagedir/$image || rc=1
+ /bin/cp -a $IMAGE $rootdir/$imagedir/$image || rc=1
fi
-rm -rf $MNTIMAGE $MNTPOINT $IMAGE
+/bin/rm -rf $MNTIMAGE $MNTPOINT $IMAGE
exit $rc
Index: movefiles.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- movefiles.py 21 May 2006 12:42:39 -0000 1.3
+++ movefiles.py 22 May 2006 05:36:38 -0000 1.4
@@ -46,7 +46,6 @@
'/etc/mtab',
'/etc/makedev.d',
'/etc/udev',
- '/etc/modprobe.conf',
]
rootdir = sys.argv[1]
@@ -56,7 +55,7 @@
dst = normalize_path (['/livecd/moved',file],rootdir)
os.renames (src, dst)
if os.path.isfile (dst):
- os.system ("touch %s" % src)
+ os.system ("/bin/touch %s" % src)
else:
os.makedirs (src)
@@ -65,7 +64,7 @@
dst = normalize_path (['/livecd/tmpfs',file],rootdir)
os.renames (src, dst)
if os.path.isfile (dst):
- os.system ("touch %s" % src)
+ os.system ("/bin/touch %s" % src)
else:
os.makedirs (src)
@@ -77,6 +76,6 @@
else:
shutil.copytree (src, dst)
-run ("cd %s/livecd/tmpfs; tar -czf %s/livecd/kadischi.tar.gz *" % (rootdir, rootdir))
+run ("cd %s/livecd/tmpfs; /bin/tar -czf %s/livecd/kadischi.tar.gz *" % (rootdir, rootdir))
clean_directory (normalize_path (['/livecd/tmpfs'],rootdir), False)
More information about the fedora-extras-commits
mailing list