diff options
Diffstat (limited to 'sysutils/mklivecd/files/livecd')
| -rw-r--r-- | sysutils/mklivecd/files/livecd | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/sysutils/mklivecd/files/livecd b/sysutils/mklivecd/files/livecd index 076157bc822..92b8234901c 100644 --- a/sysutils/mklivecd/files/livecd +++ b/sysutils/mklivecd/files/livecd @@ -1,4 +1,4 @@ -# $NetBSD: livecd,v 1.1 2005/08/11 20:48:55 xtraeme Exp $ +# $NetBSD: livecd,v 1.2 2005/08/13 23:35:45 xtraeme Exp $ # # Mount mfs directories and unpack the required files # before anything. @@ -17,17 +17,9 @@ stop_cmd="livecd_stop" livecd_start() { if [ -f /stand/usr.zfs ]; then - echo -n "=> Mounting compressed images: " /rescue/vnconfig -z vnd0 /stand/usr.zfs /rescue/mount -r /dev/vnd0a /usr - if [ ! -f /stand/var_db_pkg.zfs ]; then - echo "/usr." - else - /rescue/vnconfig -z vnd1 /stand/var_db_pkg.zfs - /rescue/mount -r /dev/vnd1a /var/db/pkg - echo "/usr, /var/db/pkg." - fi - fi + fi echo -n "=> Mounting Memory based filesystems: " @@ -37,14 +29,14 @@ livecd_start() mount_mfs @MNT_ETC_ARGS@ swap /etc echo -n "/etc, " - mount_mfs @MNT_VAR_ARGS@ swap /var - echo -n "/var, " - mount_mfs @MNT_ROOT_ARGS@ swap /root echo -n "/root, " mount_mfs @MNT_TMP_ARGS@ swap /tmp - echo "/tmp" + echo -n "/tmp, " + + mount_mfs @MNT_VAR_ARGS@ swap /var + echo "/var." @HOME@ @HOMETAR@ @@ -60,6 +52,11 @@ livecd_start() echo "=> $f not unpacked correctly!" fi done + + if [ -f /stand/var_db_pkg.zfs ]; then + /rescue/vnconfig -z vnd1 /stand/var_db_pkg.zfs + /rescue/mount -r /dev/vnd1a /var/db/pkg + fi } livecd_stop() |