Magellan Linux

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 6835 by niro, Thu Jul 23 12:28:10 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 579  install_mount_rootfs() Line 579  install_mount_rootfs()
579   fi   fi
580   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
581   then   then
582   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALL_ROOT} || die
583   fi   fi
584   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
585   then   then
586   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALL_ROOT}/boot || die
587   mount ${BOOTHDD} ${INSTALLPATH}/boot || die   mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die
588   fi   fi
589    
590   cd ${INSTALLPATH} || die   cd ${INSTALL_ROOT} || die
591  }  }
592    
593  install_system_image()  install_system_image()
594  {  {
595   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALL_ROOT}
596  }  }
597    
598  install_bootsector_chroot()  install_bootsector_chroot()
599  {  {
600   local my_roothdd   local my_roothdd
601   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   local grubconf=${INSTALL_ROOT}/boot/grub/grub.conf
602   local grub2conf=/boot/grub/grub.cfg   local grub2conf=/boot/grub/grub.cfg
603   local CONFIG   local CONFIG
604    
605   # check for grub2   # check for grub2
606   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALL_ROOT}/sbin/grub-mkconfig ]]
607   then   then
608   # needed by grub-mkconfig on the first run   # needed by grub-mkconfig on the first run
609   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]   if [[ ! -f ${INSTALL_ROOT}/boot/grub/video.lst ]]
610   then   then
611   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
612   fi   fi
613    
614   # set kernelopts   # set kernelopts
615   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALL_ROOT}/etc/conf.d/grub ]]
616   then   then
617   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
618   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
619   else   else
620   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALL_ROOT}/etc/conf.d/grub || die
621   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALL_ROOT}/etc/conf.d/grub || die
622   fi   fi
623   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
624   clearconfig   clearconfig
625   addconfig 'grub-mkdevicemap'   addconfig 'grub-mkdevicemap'
626   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 630  install_bootsector_chroot()
630   # grub-legacy   # grub-legacy
631   else   else
632   ### grubconf schreiben   ### grubconf schreiben
633   source ${INSTALLPATH}/boot/kernelversion   source ${INSTALL_ROOT}/boot/kernelversion
634    
635   #for alx only   #for alx only
636   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [ -e ${INSTALL_ROOT}/etc/alx_version ]
637   then   then
638   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
639   source ${INSTALLPATH}/etc/alx_version   source ${INSTALL_ROOT}/etc/alx_version
640   KRNVER="ALX-${ALXVER}"   KRNVER="ALX-${ALXVER}"
641   ALXVER="${OLD_ALXVER}"   ALXVER="${OLD_ALXVER}"
642   fi   fi
# Line 658  install_bootsector_chroot() Line 658  install_bootsector_chroot()
658   addconfig "default 0"   addconfig "default 0"
659   addconfig "timeout 3"   addconfig "timeout 3"
660   # using current root password   # using current root password
661   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)"
662   addconfig   addconfig
663   addconfig "# normal boot"   addconfig "# normal boot"
664   addconfig "title ${KRNVER}"   addconfig "title ${KRNVER}"
# Line 689  install_bootsector_chroot() Line 689  install_bootsector_chroot()
689   fi   fi
690    
691   # write bootsector chrooted (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
692   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
693   clearconfig   clearconfig
694   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'
695   addconfig 'root (hd0,0)'   addconfig 'root (hd0,0)'
# Line 706  install_bootsector_chroot() Line 706  install_bootsector_chroot()
706  is_initrd_supported()  is_initrd_supported()
707  {  {
708   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
709   [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0   [[ -x ${INSTALL_ROOT}/sbin/mkinitrd ]] && return 0
710   return 1   return 1
711  }  }
712    
# Line 739  install_initrd_chroot() Line 739  install_initrd_chroot()
739   fi   fi
740    
741   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
742   CONFIG=${INSTALLPATH}/etc/modprobe.d/uvesafb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/uvesafb.conf
743   clearconfig   clearconfig
744   addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"   addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
745    
746   # install an appropriate viafb.conf   # install an appropriate viafb.conf
747   CONFIG=${INSTALLPATH}/etc/modprobe.d/viafb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/viafb.conf
748   clearconfig   clearconfig
749   addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"   addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
750    
751   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
752   CONFIG=${INSTALLPATH}/etc/modprobe.d/i810fb.conf   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/i810fb.conf
753   clearconfig   clearconfig
754   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"
755    
756   CONFIG=${INSTALLPATH}/.installrc   CONFIG=${INSTALL_ROOT}/.installrc
757   clearconfig   clearconfig
758   addconfig 'echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'   addconfig 'echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'
759   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'
# Line 802  install_system_settings() Line 802  install_system_settings()
802   then   then
803   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
804   then   then
805   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALL_ROOT}/etc/fstab || die
806   fi   fi
807   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
808   then   then
809   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALL_ROOT}/etc/fstab || die
810   fi   fi
811   else   else
812   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
813   then   then
814   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALL_ROOT}/etc/fstab || die
815   fi   fi
816   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
817   then   then
818   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALL_ROOT}/etc/fstab || die
819   fi   fi
820   fi   fi
821   # 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
822   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALL_ROOT}/etc/fstab || die
823   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALL_ROOT}/etc/fstab || die
824   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALL_ROOT}/etc/fstab || die
825    
826   # install network config skeleton   # install network config skeleton
827   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
828    
829   # intel framebufer quirk   # intel framebufer quirk
830   if [[ -e /proc/fb ]]   if [[ -e /proc/fb ]]
# Line 834  install_system_settings() Line 834  install_system_settings()
834   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
835   if [[ ${fbdev} != 0 ]]   if [[ ${fbdev} != 0 ]]
836   then   then
837   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
838   fi   fi
839   fi   fi
840   fi   fi
# Line 845  install_umount_rootfs() Line 845  install_umount_rootfs()
845   cd /   cd /
846   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
847   then   then
848   umount ${INSTALLPATH}/boot || die   umount ${INSTALL_ROOT}/boot || die
849   fi   fi
850   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
851   then   then
852   umount ${INSTALLPATH} || die   umount ${INSTALL_ROOT} || die
853   fi   fi
854   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
855   then   then

Legend:
Removed from v.6834  
changed lines
  Added in v.6835