diff -ruN linuxfirmwarekit-orig/ethernet/ethernet.c linuxfirmwarekit/ethernet/ethernet.c --- linuxfirmwarekit-orig/ethernet/ethernet.c 2007-02-04 05:53:43 +0300 +++ linuxfirmwarekit/ethernet/ethernet.c 2007-03-02 16:35:12 +0300 @@ -65,7 +65,7 @@ char *details = strdup(""); unlink("/var/run/dhclient.pid"); - sprintf(command, "/sbin/dhclient %s &> /tmp/dhclient", iface); + sprintf(command, "/sbin/dhclient %s > /tmp/dhclient 2>&1", iface); system(command); file = fopen("/tmp/dhclient", "r"); if (!file) diff -ruN linuxfirmwarekit-orig/initramfs/init linuxfirmwarekit/initramfs/init --- linuxfirmwarekit-orig/initramfs/init 2006-11-06 17:24:36 +0300 +++ linuxfirmwarekit/initramfs/init 2007-03-02 16:38:43 +0300 @@ -21,7 +21,7 @@ echo 0 > /proc/sys/kernel/core_uses_pid ulimit -c unlimited /sbin/depmod -Ae -/sbin/start_udev &> /dev/null +/sbin/start_udev > /dev/null 2>&1 cd /root rm -f core ./biostest @@ -35,4 +35,4 @@ echo -----------[ cut here ] ---------------------- sleep 300 fi -/sbin/shutdown -rn now \ В конце файла нет новой строки +/sbin/shutdown -rn now diff -ruN linuxfirmwarekit-orig/lmbench/configure_test.sh linuxfirmwarekit/lmbench/configure_test.sh --- linuxfirmwarekit-orig/lmbench/configure_test.sh 2006-09-07 22:06:42 +0400 +++ linuxfirmwarekit/lmbench/configure_test.sh 2007-03-02 16:40:32 +0300 @@ -1,7 +1,7 @@ #!/bin/sh cd /root/plugins/lmbench_install/bin -ln -s . i686-pc-linux-gnuoldld &> /dev/null +ln -s . i686-pc-linux-gnuoldld & /dev/null 2>&1 cd ../scripts -./config-run < lmbench_response &> /dev/null +./config-run < lmbench_response & /dev/null 2>&1 diff -ruN linuxfirmwarekit-orig/lmbench/run_test.sh linuxfirmwarekit/lmbench/run_test.sh --- linuxfirmwarekit-orig/lmbench/run_test.sh 2006-09-07 22:06:42 +0400 +++ linuxfirmwarekit/lmbench/run_test.sh 2007-03-02 16:41:06 +0300 @@ -1,9 +1,9 @@ #!/bin/sh cd /root/plugins -ln -s lmbench_install/results results &> /dev/null +ln -s lmbench_install/results results > /dev/null 2>&1 cd lmbench_install/scripts export PATH=$PATH:/root/plugins/lmbench_install/bin:/root/plugins/lmbench_install/scripts -./results &> /dev/null -rm /root/plugins/results &> /dev/null -cp `find ../results -type f` /root/results &> /dev/null +./results > /dev/null 2>&1 +rm /root/plugins/results > /dev/null 2>&1 +cp `find ../results -type f` /root/results > /dev/null 2>&1 diff -ruN linuxfirmwarekit-orig/microcode/microcode.c linuxfirmwarekit/microcode/microcode.c --- linuxfirmwarekit-orig/microcode/microcode.c 2006-11-14 05:59:53 +0300 +++ linuxfirmwarekit/microcode/microcode.c 2007-03-02 16:41:47 +0300 @@ -118,11 +118,11 @@ "the processor at boot time. Recent microcode is important to have all the required " "features and errata updates for the processor."); - system("/sbin/modprobe microcode &> /dev/null"); + system("/sbin/modprobe microcode > /dev/null 2>&1"); gather_info(); /* now run the microcode update */ - system("/sbin/microcode_ctl -u &> /dev/null"); + system("/usr/sbin/microcode_ctl -u > /dev/null 2>&1"); /* and check for lacking updates */ gather_info(); finish_test("microcode"); diff -ruN linuxfirmwarekit-orig/thermal_trip/thermal_trip.sh linuxfirmwarekit/thermal_trip/thermal_trip.sh --- linuxfirmwarekit-orig/thermal_trip/thermal_trip.sh 2006-12-06 23:18:32 +0300 +++ linuxfirmwarekit/thermal_trip/thermal_trip.sh 2007-03-02 16:43:27 +0300 @@ -106,26 +106,26 @@ do #check if passive trip point is shown at all - if (grep passive "$ZONE/trip_points" &>/dev/null ) + if (grep passive "$ZONE/trip_points" >/dev/null 2>&1) then #save current temps CUR_PASSIVE="$(grep passive $ZONE/trip_points |sed -e 's/passive:[^0-9]*\([0-9]*\) C.*/\1/')" #critical trip point - if (grep critical "$ZONE/trip_points" &>/dev/null) + if (grep critical "$ZONE/trip_points" >/dev/null 2>&1) then export CUR_CRITICAL="$(grep critical $ZONE/trip_points |sed -e 's/critical (S5):[^0-9]*\([0-9]*\) C.*/\1/')" else export CUR_CRITICAL="0" fi #hot trip point - if (grep "^hot" "$ZONE/trip_points" &>/dev/null ) + if (grep "^hot" "$ZONE/trip_points" >/dev/null 2>&1) then export CUR_HOT="$(grep '^hot' $ZONE/trip_points |sed -e 's/hot[^\:]*:[^0-9]*\([0-9]*\) C.*/\1/')" else export CUR_HOT="0" fi #active trip points - if (grep "^active" "$ZONE/trip_points" &>/dev/null) + if (grep "^active" "$ZONE/trip_points" >/dev/null 2>&1) then export CUR_ACTIVES="$(grep '^active' $ZONE/trip_points | sed -e 's/active[^\:]*:[^0-9]*\([0-9]*\) C.*/\1/' | tr '\n' ':')0" else @@ -167,7 +167,7 @@ #mess current polling to get kernels attention echo 1 >$ZONE/polling_frequency echo 2 >$ZONE/polling_frequency - echo $CUR_POLLING >$ZONE/polling_frequency &> /dev/null + echo $CUR_POLLING >$ZONE/polling_frequency > /dev/null 2>&1 #give the kernel some time sleep 4 @@ -231,7 +231,7 @@ echo "$CUR_CRITICAL:$CUR_HOT:$CUR_PASSIVE:$CUR_ACTIVES" >$ZONE/trip_points echo 1 >$ZONE/polling_frequency echo 2 >$ZONE/polling_frequency - echo $CUR_POLLING >$ZONE/polling_frequency &> /dev/null + echo $CUR_POLLING >$ZONE/polling_frequency > /dev/null 2>&1 sleep 4 else diff -ruN linuxfirmwarekit-orig/usbports/usbports.c linuxfirmwarekit/usbports/usbports.c --- linuxfirmwarekit-orig/usbports/usbports.c 2006-09-07 22:06:42 +0400 +++ linuxfirmwarekit/usbports/usbports.c 2007-03-02 16:37:38 +0300 @@ -224,15 +224,15 @@ if (strstr(buffer, usb->device_name)==NULL) continue; - sprintf(buffer, "/bin/mount /dev/%s1 /usbkey &> mountlog", entry->d_name); + sprintf(buffer, "/bin/mount /dev/%s1 /usbkey > mountlog 2>&1", entry->d_name); if (system(buffer)) { /* no luck, unpartitioned device */ - sprintf(buffer, "/bin/mount /dev/%s /usbkey &> mountlog", entry->d_name); + sprintf(buffer, "/bin/mount /dev/%s /usbkey > mountlog 2>&1", entry->d_name); if (system(buffer)) continue; } system("cp /root/plugins/usbports.so /usbkey"); system("sync"); - system("/bin/umount /usbkey &> /dev/null"); + system("/bin/umount /usbkey > /dev/null 2>&1"); tone(2000, 1000); } while (entry); closedir(dir);