Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools
index eba686f8461fc8dea90af2865b60614f48024565..f4c82df219f3f1bc1c7572a327042c3d6a462a45 100644 (file)
--- a/config/rootfiles/common/dosfstools
+++ b/config/rootfiles/common/dosfstools
@@ -1,9 +1,9 @@
-#sbin/dosfsck
-#sbin/fsck.msdos
-#sbin/fsck.vfat
-#sbin/mkdosfs
-#sbin/mkfs.msdos
-#sbin/mkfs.vfat
+sbin/dosfsck
+sbin/fsck.msdos
+sbin/fsck.vfat
+sbin/mkdosfs
+sbin/mkfs.msdos
+sbin/mkfs.vfat
 #usr/man/man8/dosfsck.8
 #usr/man/man8/fsck.msdos.8
 #usr/man/man8/fsck.vfat.8

diff --git a/config/rootfiles/common/mtools b/config/rootfiles/common/mtools
index 9de61c4be44255b2bdf9754877be18a7f1a5ccdd..d4c5421799e24cb154d08dba8cb51f6269d32840 100644 (file)
--- a/config/rootfiles/common/mtools
+++ b/config/rootfiles/common/mtools
@@ -23,7 +23,7 @@
 #usr/bin/mrd
 #usr/bin/mren
 #usr/bin/mshowfat
-#usr/bin/mtools
+usr/bin/mtools
 #usr/bin/mtoolstest
 #usr/bin/mtype
 #usr/bin/mxtar

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 76d37c2e487d2c03101bb09911380552508f4a50..a1dd90d3f75c8c1386c149f026b470a4f2d63f66 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -125,6 +125,7 @@ int main(int argc, char *argv[])
        mysystem("/sbin/modprobe sr_mod");
        mysystem("/sbin/modprobe usb-storage");
        mysystem("/sbin/modprobe usbhid");
+       mysystem("/sbin/modprobe ahci");
 
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition