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 526 by niro, Fri Jun 27 23:32:03 2008 UTC revision 531 by niro, Sat Jun 28 00:37:45 2008 UTC
# Line 1  Line 1 
1  #!/bin/sh  #!/bin/sh
2  #  #
3  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.12 2008-06-27 23:32:03 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $
4  #  #
5  # AutoSta_LX Installation Script  # AutoSta_LX Installation Script
6  #  #
# Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ / Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ /
21  ########################################  ########################################
22    
23  ### System/Config Version  ### System/Config Version
24  VERSION="0.3"  VERSION="0.3.1"
25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
26    
27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
# Line 418  root (hd0,0) Line 418  root (hd0,0)
418  setup (hd0)  setup (hd0)
419  quit  quit
420  EOF  EOF
421  echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\" > /etc/conf.d/mkinitrd  exit 0
422  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g")  CHROOTEOF
423    
424     ## enters chroot
425     mount -t proc proc ${INSTALLPATH}/proc
426     mount -t sysfs sysfs ${INSTALLPATH}/sys
427     mount -o bind /dev ${INSTALLPATH}/dev
428     chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
429     umount ${INSTALLPATH}/proc
430     umount ${INSTALLPATH}/sys
431     umount ${INSTALLPATH}/dev
432     rm ${INSTALLPATH}/root/.bashrc
433    }
434    
435    install_mkinitrd_chroot()
436    {
437     cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
438    echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\"" > /etc/conf.d/mkinitrd
439    mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
440  exit 0  exit 0
441  CHROOTEOF  CHROOTEOF
442    
# Line 442  install_system_settings() Line 459  install_system_settings()
459   echo -e "${SWAPHDD}\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "${SWAPHDD}\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
460   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
461   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
462    
463     # install network config skeleton
464     install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
465  }  }
466    
467  install_system_settings_flash()  install_system_settings_flash()
# Line 491  run_install_normal() Line 511  run_install_normal()
511   dialog_install_settings   dialog_install_settings
512   sleep 1   sleep 1
513   install_system_settings   install_system_settings
514     install_mkinitrd_chroot
515   install_umount_rootfs   install_umount_rootfs
516   dialog_install_successful   dialog_install_successful
517  }  }
# Line 511  run_install_flash() Line 532  run_install_flash()
532   dialog_install_settings   dialog_install_settings
533   sleep 1   sleep 1
534   install_system_settings_flash   install_system_settings_flash
535     install_mkinitrd_chroot
536   install_umount_rootfs_flash   install_umount_rootfs_flash
537   dialog_install_successful   dialog_install_successful
538  }  }

Legend:
Removed from v.526  
changed lines
  Added in v.531