Magellan Linux

Diff of /trunk/mkinitrd-magellan/mkinitrd.in

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

revision 897 by niro, Wed Aug 5 17:50:57 2009 UTC revision 901 by niro, Wed Aug 5 19:20:53 2009 UTC
# Line 328  get_blkid() Line 328  get_blkid()
328   local dev="$1"   local dev="$1"
329   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
330    
331   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # check if given device is already an UUID
332     if [[ ${dev/UUID=/}x != ${dev}x ]]
333     then
334     eval "${dev}"
335     else
336     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
337     fi
338   echo ${UUID}   echo ${UUID}
339  }  }
340    
# Line 834  fi Line 840  fi
840    
841  add_initrd 'echo "-- Mounting sysroot ..."'  add_initrd 'echo "-- Mounting sysroot ..."'
842  add_initrd '. /etc/rootdev'  add_initrd '. /etc/rootdev'
 add_initrd '[ ! -e ${device} ] && mknod ${device} b ${major} ${minor}'  
843  add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'  add_initrd 'echo "${device} /sysroot ${rootfs} defaults,ro 0 0" > /etc/fstab'
844  add_initrd 'mount /sysroot || ash'  add_initrd 'mount /sysroot || ash'
845    
# Line 862  chmod +x ${DEST}/init || die Line 867  chmod +x ${DEST}/init || die
867  # setup root block device  # setup root block device
868  [[ -z ${rootdev} ]] && die "no known rootdev found."  [[ -z ${rootdev} ]] && die "no known rootdev found."
869  echo "device='UUID=$(get_blkid ${rootdev})'" > ${DEST}/etc/rootdev || die  echo "device='UUID=$(get_blkid ${rootdev})'" > ${DEST}/etc/rootdev || die
 echo "major=$(stat -c %t ${rootdev})" >> ${DEST}/etc/rootdev || die  
 echo "minor=$(stat -c %T ${rootdev})" >> ${DEST}/etc/rootdev || die  
870  echo "rootfs='${rootfs}'" >> ${DEST}/etc/rootdev || die  echo "rootfs='${rootfs}'" >> ${DEST}/etc/rootdev || die
871    
872  # install detected modules  # install detected modules

Legend:
Removed from v.897  
changed lines
  Added in v.901