Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

    revision 6834 by niro, Thu Jul 23 12:25:33 2015 UTC revision 6840 by niro, Thu Jul 23 13:03:19 2015 UTC
    # Line 19  TITLE="alxinstall-ng - ${VERSION}" Line 19  TITLE="alxinstall-ng - ${VERSION}"
    19    
    20  # locations  # locations
    21  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
    22  INSTALLPATH="/mnt/magellan"  INSTALL_ROOT="/mnt/magellan"
    23    
    24  # default system settings  # default system settings
    25  # standard kernel opts  # standard kernel opts
    # Line 46  FORMFACTOR="" Line 46  FORMFACTOR=""
    46  FORMAT_FILESYSTEM=""  FORMAT_FILESYSTEM=""
    47  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    48  SPECIALDEVICE=""  SPECIALDEVICE=""
    49    FLASHDISK=0
    50  ### linecount of system.tar.gz -1 !  ### linecount of system.tar.gz -1 !
    51  CURRENTLINE=0  CURRENTLINE=0
    52  #TOTALLINES=11072 # -> now in images.conf  #TOTALLINES=11072 # -> now in images.conf
    # Line 90  dialog_setup_hdd_info() Line 91  dialog_setup_hdd_info()
    91   ;;   ;;
    92   normal) dialog_setup_hdd_info_normal ;;   normal) dialog_setup_hdd_info_normal ;;
    93   single) dialog_setup_hdd_info_single ;;   single) dialog_setup_hdd_info_single ;;
    94     flash) dialog_setup_hdd_info_flash ;;
    95   esac   esac
    96  }  }
    97    
    # Line 123  dialog_setup_hdd_info_single() Line 125  dialog_setup_hdd_info_single()
    125   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    126  }  }
    127    
    128    dialog_setup_hdd_info_flash()
    129    {
    130     local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
    131    
    132     dialog \
    133     --colors \
    134     --title "[ Festplatten Partitionierung ]" \
    135     --backtitle "${TITLE}" \
    136     --ok-label "Weiter" \
    137     --msgbox "\nBitte legen Sie 2 Partitionen an.\n\n\
    138     [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
    139     [ \Z3${SHDD}2\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
    140     Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    141    }
    142    
    143  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
    144  {  {
    145   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    # Line 152  dialog_setup_system_menu() Line 169  dialog_setup_system_menu()
    169   "" "" \   "" "" \
    170   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
    171   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
    172   "3" "Normale IDE Disk (Single)")   "3" "Normale IDE Disk (Single)" \
    173     "4" "Flash SDHC/NAND oder USBStick (Manuell)")
    174   RES=$?   RES=$?
    175   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    176   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    # Line 161  dialog_setup_system_menu() Line 179  dialog_setup_system_menu()
    179   "1") run_install auto ;;   "1") run_install auto ;;
    180   "2") run_install normal ;;   "2") run_install normal ;;
    181   "3") run_install single ;;   "3") run_install single ;;
    182     "3") run_install flash ;;
    183   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    184   esac   esac
    185   fi   fi
    # Line 171  dialog_hardware_detection() Line 190  dialog_hardware_detection()
    190   local i   local i
    191   local hwtmp   local hwtmp
    192    
    193   if [ -x $(which mktemp &> /dev/null) ]   if [ -x $(type -P mktemp) ]
    194   then   then
    195   hwtmp="$(mktemp)"   hwtmp="$(mktemp)"
    196   else   else
    # Line 219  dialog_hardware_detection() Line 238  dialog_hardware_detection()
    238   then   then
    239   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
    240   fi   fi
    241     if [[ ${FLASHDISK} = 1 ]]
    242     then
    243     echo " \n \\ZnFlash Speicher erkannt, F2FS wird als Dateisystem benutzt.\\Zn \\" >> ${hwtmp}
    244     fi
    245    
    246   echo " \" 14 70" >> ${hwtmp}   echo " \" 14 70" >> ${hwtmp}
    247   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
    # Line 383  run_hardware_detection() Line 406  run_hardware_detection()
    406   if [[ $(< ${i}) = 1 ]]   if [[ $(< ${i}) = 1 ]]
    407   then   then
    408   removable=1   removable=1
    409     # we assume that all removable disks are flash disks
    410     export FLASHDISK=1
    411   fi   fi
    412   done   done
    413    
    # Line 489  setup_hdd_partitions() Line 514  setup_hdd_partitions()
    514   SWAPHDD=""   SWAPHDD=""
    515   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    516   ;;   ;;
    517    
    518     flash)
    519     BOOTHDD="${HDD}1"
    520     SWAPHDD=""
    521     ROOTHDD="${HDD}2"
    522     ;;
    523   esac   esac
    524    
    525   if [[ ${INSTALL_METHOD} = auto ]]   if [[ ${INSTALL_METHOD} = auto ]]
    # Line 563  setup_hdd_format() Line 594  setup_hdd_format()
    594   fi   fi
    595   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    596   then   then
    597   mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die   # f2fs is not grub/grub2 compatible
    598     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
    599     then
    600     mkfs.ext2 -q ${BOOTHDD} || die
    601     else
    602     mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
    603     fi
    604   fi   fi
    605   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    606   then   then
    # Line 573  setup_hdd_format() Line 610  setup_hdd_format()
    610    
    611  install_mount_rootfs()  install_mount_rootfs()
    612  {  {
    613     local opts
    614    
    615   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    616   then   then
    617   swapon ${SWAPHDD} || die   swapon ${SWAPHDD} || die
    618   fi   fi
    619   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    620   then   then
    621   mount ${ROOTHDD} ${INSTALLPATH} || die   # be safe here, append file system type to mount
    622     # just in case the f2fs module was not autoloaded
    623     [[ ${FORMAT_FILESYSTEM} = f2fs ]] && opts="-t fs2fs"
    624     mount ${opts} ${ROOTHDD} ${INSTALL_ROOT} || die
    625   fi   fi
    626   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    627   then   then
    628   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALL_ROOT}/boot || die
    629   mount ${BOOTHDD} ${INSTALLPATH}/boot || die   mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die
    630   fi   fi
    631    
    632   cd ${INSTALLPATH} || die   cd ${INSTALL_ROOT} || die
    633  }  }
    634    
    635  install_system_image()  install_system_image()
    636  {  {
    637   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALL_ROOT}
    638  }  }
    639    
    640  install_bootsector_chroot()  install_bootsector_chroot()
    641  {  {
    642   local my_roothdd   local my_roothdd
    643   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   local grubconf=${INSTALL_ROOT}/boot/grub/grub.conf
    644   local grub2conf=/boot/grub/grub.cfg   local grub2conf=/boot/grub/grub.cfg
    645   local CONFIG   local CONFIG
    646    
    647   # check for grub2   # check for grub2
    648   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALL_ROOT}/sbin/grub-mkconfig ]]
    649   then   then
    650   # needed by grub-mkconfig on the first run   # needed by grub-mkconfig on the first run
    651   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]   if [[ ! -f ${INSTALL_ROOT}/boot/grub/video.lst ]]
    652   then   then
    653   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die   install -m0644 ${INSTALL_ROOT}/lib/grub/*/video.lst ${INSTALL_ROOT}/boot/grub/video.lst || die
    654   fi   fi
    655    
    656   # set kernelopts   # set kernelopts
    657   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALL_ROOT}/etc/conf.d/grub ]]
    658   then   then
    659   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
    660   sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
    661   else   else
    662   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   CONFIG=${INSTALL_ROOT}/etc/conf.d/grub
    663   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die   clearconfig
    664     addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
    665     addconfig "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\""
    666   fi   fi
    667   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
    668   clearconfig   clearconfig
    669   addconfig 'grub-mkdevicemap'   addconfig 'grub-mkdevicemap'
    670   addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"   addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
    # Line 630  install_bootsector_chroot() Line 674  install_bootsector_chroot()
    674   # grub-legacy   # grub-legacy
    675   else   else
    676   ### grubconf schreiben   ### grubconf schreiben
    677   source ${INSTALLPATH}/boot/kernelversion   source ${INSTALL_ROOT}/boot/kernelversion
    678    
    679   #for alx only   #for alx only
    680   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [ -e ${INSTALL_ROOT}/etc/alx_version ]
    681   then   then
    682   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
    683   source ${INSTALLPATH}/etc/alx_version   source ${INSTALL_ROOT}/etc/alx_version
    684   KRNVER="ALX-${ALXVER}"   KRNVER="ALX-${ALXVER}"
    685   ALXVER="${OLD_ALXVER}"   ALXVER="${OLD_ALXVER}"
    686   fi   fi
    # Line 658  install_bootsector_chroot() Line 702  install_bootsector_chroot()
    702   addconfig "default 0"   addconfig "default 0"
    703   addconfig "timeout 3"   addconfig "timeout 3"
    704   # using current root password   # using current root password
    705   addconfig "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"   addconfig "password --md5 $(cat ${INSTALL_ROOT}/etc/shadow | grep root | cut -d: -f2)"
    706   addconfig   addconfig
    707   addconfig "# normal boot"   addconfig "# normal boot"
    708   addconfig "title ${KRNVER}"   addconfig "title ${KRNVER}"
    # Line 689  install_bootsector_chroot() Line 733  install_bootsector_chroot()
    733   fi   fi
    734    
    735   # write bootsector chrooted (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
    736   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
    737   clearconfig   clearconfig
    738   addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'   addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'
    739   addconfig 'root (hd0,0)'   addconfig 'root (hd0,0)'
    # Line 706  install_bootsector_chroot() Line 750  install_bootsector_chroot()
    750  is_initrd_supported()  is_initrd_supported()
    751  {  {
    752   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    753   [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0   [[ -x ${INSTALL_ROOT}/sbin/mkinitrd ]] && return 0
    754   return 1   return 1
    755  }  }
    756    
    # Line 717  install_initrd_chroot() Line 761  install_initrd_chroot()
    761   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    762   is_initrd_supported || return 0   is_initrd_supported || return 0
    763    
    764     FSMODS="${FORMAT_FILESYSTEM}"
    765   DISKMODS="sd_mod"   DISKMODS="sd_mod"
    766   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
    767   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
    # Line 733  install_initrd_chroot() Line 778  install_initrd_chroot()
    778   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    779   esac   esac
    780    
    781     # add a filesystems recoqnized by the bootloader if the current ${FORMAT_FILESYSTEM} is not supported
    782     case "${FORMAT_FILESYSTEM}" in
    783     f2fs) FSMODS+=" ext2" ;;
    784     esac
    785    
    786   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    787   then   then
    788   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
    789   fi   fi
    790    
    791   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    792   CONFIG=${INSTALLPATH}/etc/modprobe.d/uvesafb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/uvesafb.conf
    793   clearconfig   clearconfig
    794   addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"   addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
    795    
    796   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    797   CONFIG=${INSTALLPATH}/etc/modprobe.d/viafb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/viafb.conf
    798   clearconfig   clearconfig
    799   addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"   addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
    800    
    801   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
    802   CONFIG=${INSTALLPATH}/etc/modprobe.d/i810fb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/i810fb.conf
    803   clearconfig   clearconfig
    804   addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"   addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
    805    
    806   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
    807   clearconfig   clearconfig
    808   addconfig 'echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'   addconfig 'echo "MODULES=\"${FSMODS} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'
    809   addconfig 'mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null'   addconfig 'mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null'
    810   addconfig 'exit 0'   addconfig 'exit 0'
    811   ## enter chroot   ## enter chroot
    # Line 764  install_initrd_chroot() Line 814  install_initrd_chroot()
    814    
    815  is_uuid_supported()  is_uuid_supported()
    816  {  {
    817   if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]   # f2fs needs special treatments as the old busybox does not support this fs
    818     # use the blkid from util-linux instead of busybox
    819     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
    820   then   then
    821   # only detect uuids if supported   if [[ -x $(type -P blkid) ]]
    822   if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]   then
    823     return 0
    824     fi
    825     else
    826     if [[ -x $(type -P busybox.mkinitrd) ]]
    827   then   then
    828   return 0   # only detect uuids if supported
    829     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
    830     then
    831     return 0
    832     fi
    833   fi   fi
    834   fi   fi
    835    
    # Line 781  get_uuid() Line 841  get_uuid()
    841   local UUID   local UUID
    842   local SEC_TYPE   local SEC_TYPE
    843   local TYPE   local TYPE
    844     local blkidcmd
    845    
    846   local dev="$1"   local dev="$1"
    847   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
    # Line 790  get_uuid() Line 851  get_uuid()
    851   then   then
    852   eval "${dev}"   eval "${dev}"
    853   else   else
    854   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # f2fs needs special treatments as the old busybox does not support this fs
    855     # use the blkid from util-linux instead of busybox
    856     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
    857     then
    858     blkidcmd="blkid"
    859     else
    860     blkidcmd="busybox.mkinitrd blkid"
    861     fi
    862     eval $(${blkidcmd} ${dev} | grep "${dev}:" | sed 's/.*:\ //')
    863   fi   fi
    864   echo "${UUID}"   echo "${UUID}"
    865  }  }
    866    
    867  install_system_settings()  install_system_settings()
    868  {  {
    869   # schreibe fstab   local CONFIG
    870   if is_uuid_supported   local fstype
    871    
    872     # write fstab
    873     CONFIG=${INSTALL_ROOT}/etc/fstab
    874     clearconfig
    875    
    876     if [[ -n ${BOOTHDD} ]]
    877   then   then
    878   if [[ -n ${BOOTHDD} ]]   if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
      then  
      echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die  
      fi  
      if [[ -n ${ROOTHDD} ]]  
    879   then   then
    880   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   # grub/grub2 does not support boot from f2fs, use ext2 instead
    881     fstype="ext2"
    882     else
    883     fstype="${FORMAT_FILESYSTEM}"
    884   fi   fi
    885   else   if is_uuid_supported
      if [[ -n ${BOOTHDD} ]]  
    886   then   then
    887   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${fstype}\tnoatime,noauto\t1 1"
    888     else
    889     addconfig -e "${BOOTHDD}\t/boot\t${fstype}\tnoatime,noauto\t1 1"
    890   fi   fi
    891   if [[ -n ${ROOTHDD} ]]   fi
    892    
    893     if [[ -n ${ROOTHDD} ]]
    894     then
    895     if is_uuid_supported
    896   then   then
    897   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
    898     else
    899     addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
    900   fi   fi
    901   fi   fi
    902    
    903   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    904   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
    905   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    906   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
    907    
    908   # install network config skeleton   # install network config skeleton
    909   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die   install -m0644 ${INSTALL_ROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALL_ROOT}/etc/conf.d/ || die
    910    
    911   # intel framebufer quirk   # intel framebufer quirk
    912   if [[ -e /proc/fb ]]   if [[ -e /proc/fb ]]
    # Line 834  install_system_settings() Line 916  install_system_settings()
    916   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    917   if [[ ${fbdev} != 0 ]]   if [[ ${fbdev} != 0 ]]
    918   then   then
    919   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALL_ROOT}/etc/splash/splash.conf || die
    920   fi   fi
    921   fi   fi
    922   fi   fi
    # Line 845  install_umount_rootfs() Line 927  install_umount_rootfs()
    927   cd /   cd /
    928   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    929   then   then
    930   umount ${INSTALLPATH}/boot || die   umount ${INSTALL_ROOT}/boot || die
    931   fi   fi
    932   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    933   then   then
    934   umount ${INSTALLPATH} || die   umount ${INSTALL_ROOT} || die
    935   fi   fi
    936   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    937   then   then
    # Line 888  run_install() Line 970  run_install()
    970   single)   single)
    971   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    972   ;;   ;;
    973     flash)
    974     export FORMAT_FILESYSTEM="f2fs"
    975     export INSTALL_METHOD="${method}"
    976     ;;
    977   *)   *)
    978   echo "Unknown install method '${method}', aborting."   echo "Unknown install method '${method}', aborting."
    979   exit 1   exit 1
    Legend:
    Removed from v.6834  
    changed lines
      Added in v.6840