Magellan Linux

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

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

revision 2442 by niro, Tue Jan 7 14:48:42 2014 UTC revision 2443 by niro, Tue Jan 7 14:50:35 2014 UTC
# Line 618  CHROOTEOF Line 618  CHROOTEOF
618    
619  install_system_settings()  install_system_settings()
620  {  {
621   # schreibe fstab   local CONFIG
622   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
623   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # write fstab
624   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
625   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   clearconfig
626   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
627     addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
628     addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
629    
630   # install network config skeleton   # install network config skeleton
631   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
632     clearconfig
633     addconfig 'ONBOOT="yes"'
634     addconfig 'NETWORKING="dhcp"'
635    
636   # intel framebuffer quirk   # intel framebuffer quirk
637   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]

Legend:
Removed from v.2442  
changed lines
  Added in v.2443