summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/mount.c
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-23 12:30:25 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-23 12:30:25 +0000
commit73c757e0a55c903c860f1f6a06ae6c87d3165d2b (patch)
treea869517ec0b994993a7a2ba619d81de2fc72e497 /mdk-stage1/mount.c
parent13f022f57a5ae30588d3dd5955afd8945699c93d (diff)
downloaddrakx-backup-do-not-use-73c757e0a55c903c860f1f6a06ae6c87d3165d2b.tar
drakx-backup-do-not-use-73c757e0a55c903c860f1f6a06ae6c87d3165d2b.tar.gz
drakx-backup-do-not-use-73c757e0a55c903c860f1f6a06ae6c87d3165d2b.tar.bz2
drakx-backup-do-not-use-73c757e0a55c903c860f1f6a06ae6c87d3165d2b.tar.xz
drakx-backup-do-not-use-73c757e0a55c903c860f1f6a06ae6c87d3165d2b.zip
(my_insmod) rename as (my_modprobe) as it really what it is
Diffstat (limited to 'mdk-stage1/mount.c')
-rw-r--r--mdk-stage1/mount.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 918f5d1a2..008fb5f6b 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -212,8 +212,8 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
}
if (!strcmp(fs, "supermount")) {
- my_insmod("supermount", ANY_DRIVER_TYPE, NULL, 1);
- my_insmod("isofs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("supermount", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("isofs", ANY_DRIVER_TYPE, NULL, 1);
opts = alloca(500);
sprintf(opts, "dev=%s,fs=iso9660,tray_lock=always", dev);
dev = "none";
@@ -221,41 +221,41 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
#ifndef DISABLE_MEDIAS
if (!strcmp(fs, "vfat")) {
- my_insmod("nls_cp437", ANY_DRIVER_TYPE, NULL, 1);
- my_insmod("nls_iso8859_1", ANY_DRIVER_TYPE, NULL, 1);
- my_insmod("vfat", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("nls_cp437", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("nls_iso8859_1", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("vfat", ANY_DRIVER_TYPE, NULL, 1);
opts = "check=relaxed";
}
if (!strcmp(fs, "ntfs")) {
- my_insmod("ntfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("ntfs", ANY_DRIVER_TYPE, NULL, 1);
}
if (!strcmp(fs, "reiserfs"))
- my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("reiserfs", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "reiser4"))
- my_insmod("reiser4", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("reiser4", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "jfs"))
- my_insmod("jfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("jfs", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "xfs"))
- my_insmod("xfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("xfs", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "ext4"))
- my_insmod("ext4", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("ext4", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "btrfs"))
- my_insmod("btrfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("btrfs", ANY_DRIVER_TYPE, NULL, 1);
#endif
if (!strcmp(fs, "iso9660"))
- my_insmod("isofs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("isofs", ANY_DRIVER_TYPE, NULL, 1);
#ifndef DISABLE_NETWORK
if (!strcmp(fs, "nfs")) {
- my_insmod("nfs", ANY_DRIVER_TYPE, NULL, 1);
+ my_modprobe("nfs", ANY_DRIVER_TYPE, NULL, 1);
log_message("preparing nfsmount for %s", dev);
rc = nfsmount_prepare(dev, &opts);
if (rc != 0)