installer: Finish incomplete commit to merge nrelease/{installer,root}.
authorSascha Wildner <saw@online.de>
Thu, 5 Nov 2009 20:10:03 +0000 (21:10 +0100)
committerSascha Wildner <saw@online.de>
Thu, 5 Nov 2009 20:10:03 +0000 (21:10 +0100)
nrelease/installer/etc/fstab [deleted file]
nrelease/root/etc/defaults/pfi.conf [moved from nrelease/installer/etc/defaults/pfi.conf with 100% similarity]
nrelease/root/etc/dhcpd.conf [moved from nrelease/installer/etc/dhcpd.conf with 99% similarity]
nrelease/root/etc/fstab

diff --git a/nrelease/installer/etc/fstab b/nrelease/installer/etc/fstab
deleted file mode 100644 (file)
index b00b1fc..0000000
+++ /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
similarity index 99%
rename from nrelease/installer/etc/dhcpd.conf
rename to nrelease/root/etc/dhcpd.conf
index e8d857a..1dcbb4d 100644 (file)
@@ -30,4 +30,3 @@ subnet 10.1.0.0 netmask 255.255.0.0 {
        next-server 10.1.0.1;
     }
 }
-
index 17d751a..b00b1fc 100644 (file)
@@ -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