From: Sascha Wildner Date: Thu, 5 Nov 2009 20:10:03 +0000 (+0100) Subject: installer: Finish incomplete commit to merge nrelease/{installer,root}. X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/17b6b963c70778d7790e03ec8892cb8f30730e57 installer: Finish incomplete commit to merge nrelease/{installer,root}. --- diff --git a/nrelease/installer/etc/fstab b/nrelease/installer/etc/fstab deleted file mode 100644 index b00b1fc158..0000000000 --- a/nrelease/installer/etc/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# -# Device Mountpoint FStype Options Dump Pass# -/dev/acd0a / cd9660 ro,noauto 0 0 -swap /root mfs rw,-C,-s=8192 0 0 -swap /var mfs rw,-C,-s=8192 0 0 -swap /tmp mfs rw,-C,-s=8192 0 0 -swap /etc mfs rw,-C,-s=24576 0 0 -swap /usr/local/etc mfs rw,-C,-s=8192 0 0 -proc /proc procfs rw 0 0 diff --git a/nrelease/installer/etc/defaults/pfi.conf b/nrelease/root/etc/defaults/pfi.conf similarity index 100% rename from nrelease/installer/etc/defaults/pfi.conf rename to nrelease/root/etc/defaults/pfi.conf diff --git a/nrelease/installer/etc/dhcpd.conf b/nrelease/root/etc/dhcpd.conf similarity index 99% rename from nrelease/installer/etc/dhcpd.conf rename to nrelease/root/etc/dhcpd.conf index e8d857aa91..1dcbb4d271 100644 --- a/nrelease/installer/etc/dhcpd.conf +++ b/nrelease/root/etc/dhcpd.conf @@ -30,4 +30,3 @@ subnet 10.1.0.0 netmask 255.255.0.0 { next-server 10.1.0.1; } } - diff --git a/nrelease/root/etc/fstab b/nrelease/root/etc/fstab index 17d751aa2d..b00b1fc158 100644 --- a/nrelease/root/etc/fstab +++ b/nrelease/root/etc/fstab @@ -1,6 +1,7 @@ # # Device Mountpoint FStype Options Dump Pass# /dev/acd0a / cd9660 ro,noauto 0 0 +swap /root mfs rw,-C,-s=8192 0 0 swap /var mfs rw,-C,-s=8192 0 0 swap /tmp mfs rw,-C,-s=8192 0 0 swap /etc mfs rw,-C,-s=24576 0 0