Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)
config/rootfiles/common/dosfstools
config/rootfiles/common/mtools
src/install+setup/install/main.c

index eba686f..f4c82df 100644 (file)
@@ -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
index 9de61c4..d4c5421 100644 (file)
@@ -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
index 76d37c2..a1dd90d 100644 (file)
@@ -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