From 9de3c7f611de2b3ba1aa7bee70621632159b091b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 May 2014 11:06:20 +0200 Subject: [PATCH] installer: make it silence 2nd try. --- src/install+setup/install/main.c | 2 -- src/install+setup/install/mountsource.sh | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 9dd39ca84..e61f94dab 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -124,8 +124,6 @@ int main(int argc, char *argv[]) } // Load common modules - mysystem("/sbin/modprobe isofs"); // CDROM - mysystem("/sbin/modprobe ext4"); // Boot patition mysystem("/sbin/modprobe vfat"); // USB key /* German is the default */ diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index 2e6a66993..c3350209c 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -42,7 +42,7 @@ done # scan all Partitions on block devices for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;` do - for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///" 2> /dev/null);do + for DEVICEP in $(ls /dev/${DEVICE}? 2>/dev/null | sed "s/\/dev\///");do mount /dev/${DEVICEP} /cdrom 2> /dev/null if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then echo -n ${DEVICEP} > /tmp/source_device @@ -58,7 +58,7 @@ done # scan all Partitions on raid/mmc devices for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;` do - for DEVICEP in $(ls /dev/${DEVICE}p? | sed "s/\/dev\///" 2> /dev/null);do + for DEVICEP in $(ls /dev/${DEVICE}p? 2>/dev/null | sed "s/\/dev\///");do mount /dev/${DEVICEP} /cdrom 2> /dev/null if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then echo -n ${DEVICEP} > /tmp/source_device -- 2.39.2