diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-27 12:41:40 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-03-27 12:41:40 +0000 |
| commit | 9f79d2fbccf76167709a00c2a0276bc58b2b32a7 (patch) | |
| tree | 8f44908043c400efb7ea34163581d7a7140b925a /packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix | |
| parent | 999dbe88185bbaac1c36ab61100b544d72e627f6 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/27 13:54:04+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/27 13:53:48+02:00 uni-frankfurt.de!mickeyl
fix timezones not packaging New York and Los Angeles
2005/03/27 13:53:13+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded
2005/03/27 13:52:28+02:00 handhelds.org!CoreDump
Fix 2>1 to 2>&1
2005/03/27 13:43:31+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded
2005/03/27 13:42:50+02:00 dyndns.org!reenoo
openssh: revert to secure "PermitEmptyPasswords no" in the default sshd_config
BKrev: 4246aa04vPbpVOO525Z8UyvVO9HH5w
Diffstat (limited to 'packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix')
| -rw-r--r-- | packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol index 62b0b35186..a857817bbc 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol +++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol @@ -131,10 +131,10 @@ case "$ACTION" in if test -z "$FS_MOUNT_POINT" then # See if /mnt/card is already mounted - if ! mount|awk '{print $3}'|grep "^$MOUNT_POINT$" 2>1 >/dev/null + if ! mount|awk '{print $3}'|grep "^$MOUNT_POINT$" 2>&1 >/dev/null then # Check if another *existing* partition is configured as /mnt/card - if ! echo "$fstab_txt" | grep "$MOUNT_POINT" | awk '{print $2}'| grep "^$MOUNT_POINT$" 2>1 >/dev/null + if ! echo "$fstab_txt" | grep "$MOUNT_POINT" | awk '{print $2}'| grep "^$MOUNT_POINT$" 2>&1 >/dev/null then # As /mnt/card wasn't configured in fstab, we simply mount the # first unconfigured partition we find @@ -144,7 +144,7 @@ case "$ACTION" in # as /mnt/card for xpart in $OK_PARTS do - if echo "$fstab_txt" | grep "$xpart" | awk '{print $2}'| grep "^$MOUNT_POINT$" 2>1 >/dev/null + if echo "$fstab_txt" | grep "$xpart" | awk '{print $2}'| grep "^$MOUNT_POINT$" 2>&1 >/dev/null then vecho "-> $MOUNT_POINT is reserved by fstab" found=1 @@ -181,7 +181,7 @@ case "$ACTION" in fi vecho "-> Trying VFAT mount [$SD_OPTS_VFAT]..." - mount $FSTYPE -o $SD_OPTS_VFAT $DEVICE $FS_MOUNT_POINT 2>1 >/dev/null + mount $FSTYPE -o $SD_OPTS_VFAT $DEVICE $FS_MOUNT_POINT 2>&1 >/dev/null MOUNT_RES=`mount | grep $DEVICE` |