summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <tnut at nutyx dot com>2011-05-28 10:49:41 +0200
committertnut <tnut at nutyx dot com>2011-05-28 10:49:41 +0200
commitd3791378b0f93da3545fedf854fa135937e349fc (patch)
tree86abd90f3dd168e3dec9ce2e25d34d4fc6e5c80a
parent5ce29f10f6f95e4d5c0f2e029c9e7deca291239e (diff)
parent973110d68f63c6eb042843faf7404aa791c66dc5 (diff)
downloadnutyx-extra-d3791378b0f93da3545fedf854fa135937e349fc.tar.gz
nutyx-extra-d3791378b0f93da3545fedf854fa135937e349fc.tar.bz2
nutyx-extra-d3791378b0f93da3545fedf854fa135937e349fc.tar.xz
nutyx-extra-d3791378b0f93da3545fedf854fa135937e349fc.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r--base/aaabasicfs/.footprint.i6862
-rw-r--r--base/aaabasicfs/.footprint.x86_642
-rw-r--r--base/aaabasicfs/.md5sum.i6862
-rw-r--r--base/aaabasicfs/.md5sum.x86_642
4 files changed, 4 insertions, 4 deletions
diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686
index 5797b10f9..937942351 100644
--- a/base/aaabasicfs/.footprint.i686
+++ b/base/aaabasicfs/.footprint.i686
@@ -156,7 +156,7 @@ lrwxrwxrwx root/root root/inittab -> ../etc/inittab
lrwxrwxrwx root/root root/inputrc -> ../etc/inputrc
lrwxrwxrwx root/root root/jdk.sh -> ../etc/profile.d/jdk.sh
lrwxrwxrwx root/root root/menu.lst -> ../boot/grub/menu.lst
-lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.conf
+lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.d/modprobe.conf
lrwxrwxrwx root/root root/modules -> ../etc/sysconfig/modules
lrwxrwxrwx root/root root/network -> ../etc/sysconfig/network
lrwxrwxrwx root/root root/pkg-get.conf -> ../etc/pkg-get.conf
diff --git a/base/aaabasicfs/.footprint.x86_64 b/base/aaabasicfs/.footprint.x86_64
index b8a7879f0..783d2f346 100644
--- a/base/aaabasicfs/.footprint.x86_64
+++ b/base/aaabasicfs/.footprint.x86_64
@@ -157,7 +157,7 @@ lrwxrwxrwx root/root root/inittab -> ../etc/inittab
lrwxrwxrwx root/root root/inputrc -> ../etc/inputrc
lrwxrwxrwx root/root root/jdk.sh -> ../etc/profile.d/jdk.sh
lrwxrwxrwx root/root root/menu.lst -> ../boot/grub/menu.lst
-lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.conf
+lrwxrwxrwx root/root root/modprobe.conf -> ../etc/modprobe.d/modprobe.conf
lrwxrwxrwx root/root root/modules -> ../etc/sysconfig/modules
lrwxrwxrwx root/root root/network -> ../etc/sysconfig/network
lrwxrwxrwx root/root root/pkg-get.conf -> ../etc/pkg-get.conf
diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index 4b409fb74..fbb7b820e 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
7a45a1acf3566ca924f9a32f069bd7f2 lfs-bootscripts-02.patch
5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
-f6c548de7fc44b0fbc503ba0189d5c91 network
+6bd38769ed6f5df86e8046b68326f7f4 network
4f193837349d63e6c98501f221904170 nu
210fdabd07248f79617508807715167b profile
b860cf492e983f400666fa43c00f2954 rc
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index 4b409fb74..fbb7b820e 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
7a45a1acf3566ca924f9a32f069bd7f2 lfs-bootscripts-02.patch
5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
-f6c548de7fc44b0fbc503ba0189d5c91 network
+6bd38769ed6f5df86e8046b68326f7f4 network
4f193837349d63e6c98501f221904170 nu
210fdabd07248f79617508807715167b profile
b860cf492e983f400666fa43c00f2954 rc