echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
-mountpoint=/live_media
+mountpoint=/live/image
root_persistence="live-rw"
home_persistence="home-rw"
export DEFCONFSOLE
;;
+ debug)
+ DEBUG="Yes"
+ export DEBUG
+
+ set -x
+ ;;
+
hostname=*)
HOSTNAME=${x#hostname=}
LIVECONF="changed"
kmodel=*|console-setup/modelcode=*)
KMODEL=${x#*=}
+ export KMODEL
;;
koptions=*)
KOPTIONS=${x#koptions=}
+ export KOPTIONS
;;
live-getty)
export NETBOOT
;;
- nfsopts=)
+ nfsopts=*)
NFSOPTS=${x#nfsopts=}
export NFSOPTS
;;
export NOXAUTOLOGIN
;;
+ nofastboot)
+ NOFASTBOOT="Yes"
+ export NOFASTBOOT
+ ;;
+
nopersistent)
PERSISTENT=""
export PERSISTENT
export SHOWMOUNTS
;;
+ timezone=*)
+ TIMEZONE="${x#timezone=}"
+ export TIMEZONE
+ ;;
+
todisk=*)
TODISK=${x#todisk=}
export TODISK
export TORAM
;;
+ union=*)
+ UNIONTYPE="${x#union=}"
+ export UNIONTYPE
+ ;;
+
xdebconf)
XDEBCONF="Yes"
export XDEBCONF
if [ -z "${MODULE}" ]
then
MODULE="filesystem"
+ export MODULE
+ fi
+
+ if [ -z "${UNIONTYPE}" ]
+ then
+ UNIONTYPE="unionfs"
+ export UNIONTYPE
fi
}
NFSROOT=${ROOTSERVER}:${ROOTPATH}
fi
+ # source relevant ipconfig output
+ . /tmp/net-${DEVICE}.conf
+ export HOSTNAME
+
+ if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
+ NFSROOT=${ROOTSERVER}:${NFSROOT}
+ fi
+
[ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
image_directory="$1"
rootmnt="$2"
- modprobe "${MP_QUIET}" -b unionfs
+ modprobe "${MP_QUIET}" -b ${UNIONTYPE}
# run-init can't deal with images in a subdir, but we're going to
# move all of these away before it runs anyway. No, we're not,
mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
- mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+ mount -t ${UNIONTYPE} -o dirs=/cow=rw:$rofsstring ${UNIONTYPE} "$rootmnt" || panic "${UNIONTYPE} mount failed"
# Adding other custom mounts
if [ -n "${PERSISTENT}" ]; then
fi
# shows cow fs on /cow for use by live-snapshot
- mkdir -p "${rootmnt}/cow"
- mount -o bind /cow "${rootmnt}/cow"
+ mkdir -p "${rootmnt}/live/cow"
+ mount -o bind /cow "${rootmnt}/live/cow"
}
check_dev ()
live_dest="${TODISK}"
fi
if [ "${live_dest}" ]; then
- log_begin_msg "Copying live_media to ${live_dest}"
+ log_begin_msg "Copying live media to ${live_dest}"
copy_live_to "${livefs_root}" "${live_dest}"
log_end_msg
fi