diff -Naur mkinitrd-6.3.5/livecd/linuxrc.sh mkinitrd-6.3.5-magellan/livecd/linuxrc.sh --- mkinitrd-6.3.5/livecd/linuxrc.sh 2012-04-23 16:18:35.714982656 +0200 +++ mkinitrd-6.3.5-magellan/livecd/linuxrc.sh 2012-04-23 16:14:56.453982660 +0200 @@ -63,7 +63,8 @@ BREAK_ENABLED=no UNIONFS=no UNIONFS_FILE="" -CLOOPMOUNTDIR="/sysroot/mnt/cloop" +SYSROOT="/sysroot" +CLOOPMOUNTDIR="${SYSROOT}/mnt/cloop" ## starts here ## @@ -124,13 +125,13 @@ echo /sbin/mdev > /proc/sys/kernel/hotplug # create newroot mount point -mkdir -p /sysroot +mkdir -p ${SYSROOT} # fake a new filesystem (also needed with an initramfs!!) -mount -t tmpfs tmpfs /sysroot +mount -t tmpfs tmpfs ${SYSROOT} -mkdir -p /sysroot/mnt/cdrom -mkdir -p /sysroot/mnt/cloop -mkdir -p /sysroot/mnt/magellan +mkdir -p ${SYSROOT}/mnt/cdrom +mkdir -p ${SYSROOT}/mnt/cloop +mkdir -p ${SYSROOT}/mnt/magellan # needed for the usbstick, the timeout maybe to short @@ -182,17 +183,17 @@ exit 1 else echo -e "Booting from: $BOOT_DEVICE ..." - mount -o ro -t "${FSTYPE}" "${BOOT_DEVICE}" /sysroot/mnt/cdrom >/dev/null 2>&1 + mount -o ro -t "${FSTYPE}" "${BOOT_DEVICE}" ${SYSROOT}/mnt/cdrom >/dev/null 2>&1 # write our boot_device to /mnt/.bootdev for later use (mtab) - echo "BOOTDEV=${BOOT_DEVICE}" > /sysroot/.bootdev - echo "FSTYPE=${FSTYPE}" >> /sysroot/.bootdev + echo "BOOTDEV=${BOOT_DEVICE}" > ${SYSROOT}/.bootdev + echo "FSTYPE=${FSTYPE}" >> ${SYSROOT}/.bootdev # mount squashfs echo -e "Mounting squashfs system image ..." echo [ ! -e /dev/loop0 ] && mknod /dev/loop0 b 7 0 - mount -o loop,ro -t squashfs /sysroot/mnt/cdrom/livecdrootfs.sqsh "${CLOOPMOUNTDIR}" + mount -o loop,ro -t squashfs ${SYSROOT}/mnt/cdrom/livecdrootfs.sqsh "${CLOOPMOUNTDIR}" # mount unionfs if enabled if [[ ${UNIONFS} = yes ]] @@ -200,38 +201,38 @@ echo -e "Mounting writeable cdbuffer (unionfs) ..." # default setting - CLOOPMOUNTDIR="/sysroot/mnt/unionfs" - [[ -z ${UNIONFS_FILE} ]] && UNIONFS_FILE="/sysroot/mnt/cdrom/unionfs" + CLOOPMOUNTDIR="${SYSROOT}/mnt/unionfs" + [[ -z ${UNIONFS_FILE} ]] && UNIONFS_FILE="${SYSROOT}/mnt/cdrom/unionfs" - [[ ! -d /sysroot/mnt/unionfs ]] && install -d /sysroot/mnt/unionfs - mount -t unionfs dirs=${UNIONFS_FILE}=rw:/sysroot/mnt/cloop=ro ${CLOOPMOUNTDIR} + [[ ! -d ${SYSROOT}/mnt/unionfs ]] && install -d ${SYSROOT}/mnt/unionfs + mount -t unionfs dirs=${UNIONFS_FILE}=rw:${SYSROOT}/mnt/cloop=ro ${CLOOPMOUNTDIR} fi # symlinking cloop rootfs to /mnt as newroot - cd /sysroot + cd ${SYSROOT} for x in bin sbin lib lib64 boot usr opt do - [ -d ${CLOOPMOUNTDIR/\/sysroot\//}/${x} ] && ln -s ${CLOOPMOUNTDIR/\/sysroot\//}/${x} ${x} + [ -d ${CLOOPMOUNTDIR}/${x} ] && ln -s ${CLOOPMOUNTDIR#${SYSROOT}}/${x} ${x} done mkdir -p initrd proc tmp sys var/tmp dev media - # make /sysroot/dev/console & /mnt/dev/null - [ ! -e /sysroot/dev/console ] && mknod -m 600 /sysroot/dev/console c 5 1 - [ ! -e /sysroot/dev/null ] && mknod -m 666 /sysroot/dev/null c 1 3 + # make ${SYSROOT}/dev/console & /mnt/dev/null + [ ! -e ${SYSROOT}/dev/console ] && mknod -m 600 ${SYSROOT}/dev/console c 5 1 + [ ! -e ${SYSROOT}/dev/null ] && mknod -m 666 ${SYSROOT}/dev/null c 1 3 # only to be safe and to have a log channel - [ ! -e /sysroot/dev/tty ] && mknod /sysroot/dev/tty c 5 0 + [ ! -e ${SYSROOT}/dev/tty ] && mknod ${SYSROOT}/dev/tty c 5 0 # busybox needs this one - [ ! -e /sysroot/dev/tty5 ] && mknod /sysroot/dev/tty5 c 4 5 + [ ! -e ${SYSROOT}/dev/tty5 ] && mknod ${SYSROOT}/dev/tty5 c 4 5 - (cd ${CLOOPMOUNTDIR}; cp -a etc root home var /sysroot) + (cd ${CLOOPMOUNTDIR}; cp -a etc root home var ${SYSROOT}) - # ensure that /sysroot/linurc exists - [ ! -e /sysroot/linuxrc ] && ln -snf ${INITEXEC} /sysroot/linuxrc + # ensure that ${SYSROOT}/linurc exists + [ ! -e ${SYSROOT}/linuxrc ] && ln -snf ${INITEXEC} ${SYSROOT}/linuxrc # ensure the right permissions - chmod 1777 /sysroot/tmp - chmod 1777 /sysroot/var/tmp + chmod 1777 ${SYSROOT}/tmp + chmod 1777 ${SYSROOT}/var/tmp fi cd / @@ -249,8 +250,8 @@ fi echo "-- Switching to real sysroot ..." -mount --move /dev /sysroot/dev -mount --move /sys /sysroot/sys -mount --move /proc /sysroot/proc +mount --move /dev ${SYSROOT}/dev +mount --move /sys ${SYSROOT}/sys +mount --move /proc ${SYSROOT}/proc -exec run-init /sysroot ${INITEXEC} $@ /sysroot/dev/console +exec run-init ${SYSROOT} ${INITEXEC} $@ < ${SYSROOT}/dev/console > ${SYSROOT}/dev/console