Magellan Linux

Diff of /trunk/installer-simple/bin/installer.sh.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2344 by niro, Fri Jan 3 15:01:06 2014 UTC revision 2345 by niro, Fri Jan 3 15:02:43 2014 UTC
# Line 180  dialog_hardware_detection() Line 180  dialog_hardware_detection()
180   local i   local i
181   local hwtmp   local hwtmp
182    
183   if [ -x $(which mktemp &> /dev/null) ]   if [ -x $(type -P mktemp) ]
184   then   then
185   hwtmp="$(mktemp)"   hwtmp="$(mktemp)"
186   else   else
# Line 831  CHROOTEOF Line 831  CHROOTEOF
831    
832  is_uuid_supported()  is_uuid_supported()
833  {  {
834   if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]   if [[ -x $(type -P busybox.mkinitrd) ]]
835   then   then
836   # only detect uuids if supported   # only detect uuids if supported
837   if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]   if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]

Legend:
Removed from v.2344  
changed lines
  Added in v.2345