Magellan Linux

Diff of /trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom

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

revision 3063 by niro, Thu Aug 31 12:27:43 2017 UTC revision 3064 by niro, Thu Aug 31 12:55:23 2017 UTC
# Line 44  create_install_tarball() Line 44  create_install_tarball()
44   --update-tarball \   --update-tarball \
45   --basesystem basesystem || die "bootstrapping target system failed!"   --basesystem basesystem || die "bootstrapping target system failed!"
46    
 # # HACK: add all mesa-gallium modules but intel modules  
 # local i  
 # for i in nouveau r300 r600 radeonsi swrast  
 # do  
 # CDCHROOTDIR=${LIVECDROOT}/install-temp custom_packages install "mesa-gallium-${i}" || die  
 # done  
 #  
 # # HACK: add mesa-gallium-i915  
 # CDCHROOTDIR=${LIVECDROOT}/install-temp custom_packages install "mesa-gallium-i915" || die  
 #  
 # # HACK: add all mesa-dri modules  
 # local i  
 # for i in i915 i965 nouveau r200 radeon swrast  
 # do  
 # CDCHROOTDIR=${LIVECDROOT}/install-temp custom_packages install "mesa-dri-${i}" || die  
 # done  
 # # but disable i915_dri atm, which breaks  
 # if [[ -L ${LIVECDROOT}/install-temp/usr/lib/dri/i915_dri.so ]]  
 # then  
 # rm ${LIVECDROOT}/install-temp/usr/lib/dri/i915_dri.so  
 # fi  
   
47  ## DEV SERVER ##  ## DEV SERVER ##
48  # NEW_MCORE_CONTROL_SERVER="alx-control-dev.dom-aka-nt.intern"  # NEW_MCORE_CONTROL_SERVER="alx-control-dev.dom-aka-nt.intern"
49  # CONFIG="${LIVECDROOT}/install-temp/etc/mcore/mcore.conf"  # CONFIG="${LIVECDROOT}/install-temp/etc/mcore/mcore.conf"
# Line 90  create_install_tarball() Line 68  create_install_tarball()
68   # empty root password   # empty root password
69   chroot ${LIVECDROOT}/install-temp passwd -d root   chroot ${LIVECDROOT}/install-temp passwd -d root
70    
  # add user station with empty password  
 # chroot ${LIVECDROOT}/install-temp adduser -G users -h /home/station -s /bin/bash -D station  
   
71   # empty user password   # empty user password
72   chroot ${LIVECDROOT}/install-temp passwd -d station   chroot ${LIVECDROOT}/install-temp passwd -d station
73    
  # install xinitrc  
 # echo 'exec startfluxbox' > ${LIVECDROOT}/install-temp/home/station/.xinitrc  
   
74   if [ -x ${LIVECDROOT}/install-temp/usr/bin/mcorepasswd ] ||   if [ -x ${LIVECDROOT}/install-temp/usr/bin/mcorepasswd ] ||
75   [ -L ${LIVECDROOT}/install-temp/usr/bin/mcorepasswd ]   [ -L ${LIVECDROOT}/install-temp/usr/bin/mcorepasswd ]
76   then   then
# Line 118  ff02::2         ip6-allrouters Line 90  ff02::2         ip6-allrouters
90  ff02::3         ip6-allhosts  ff02::3         ip6-allhosts
91  EOF  EOF
92    
 # # create a default network interface config file  
 # cat > ${LIVECDROOT}/install-temp/etc/conf.d/net.eth0 << EOF  
 #ONBOOT="yes"  
 #NETWORKING="dhcp"  
 #EOF  
   
  # fix mage.rc and config.rc  
 # NEW_SQL_USER="alx_install"  
 # NEW_SQL_PASS="@lx"  
 # NEW_SQL_HOST="128.20.41.110"  
 # NEW_SQL_DB="alx_web"  
 # NEW_SMB_UPDATE_HOST="//${NEW_SQL_HOST}/magetmp"  
 # NEW_SMB_UPDATE_USER="${NEW_SQL_USER}"  
 # NEW_SMB_UPDATE_PASS="${NEW_SQL_PASS}"  
 # NEW_MAGE_MIRRORS="http://${NEW_SQL_HOST}/magellan/alx-070"  
 # NEW_MAGE_RSYNC="rsync://${NEW_SQL_HOST}/mage-alx-070"  
 # NEW_RSYNC="${NEW_MAGE_RSYNC}"  
 # NEW_SMAGE2RSYNC="rsync://${NEW_SQL_HOST}/smage-alx-070"  
 # NEW_MIRRORS="${NEW_MAGE_MIRRORS}"  
 # NEW_MAGE_UNINSTALL_TIMEOUT="0"  
 # CONFIG="${LIVECDROOT}/install-temp/etc/mage.rc"  
 # updateconfig RSYNC SMAGE2RSYNC MIRRORS MAGE_UNINSTALL_TIMEOUT  
 # CONFIG="${LIVECDROOT}/install-temp/etc/alxconfig-ng/config.rc"  
 # updateconfig SQL_USER SQL_PASS SQL_HOST SQL_DB SMB_UPDATE_HOST SMB_UPDATE_USER SMB_UPDATE_PASS MAGE_MIRRORS MAGE_RSYNC  
   
93   # create tarball   # create tarball
94   [[ -f ${CDISOROOT}/system/alx-i486.tar.bz2 ]] && rm ${CDISOROOT}/system/alx-i486.tar.bz2   [[ -f ${CDISOROOT}/system/alx-i486.tar.bz2 ]] && rm ${CDISOROOT}/system/alx-i486.tar.bz2
95   ( cd ${LIVECDROOT}/install-temp; tar cvjpf ${CDISOROOT}/system/alx-i486.tar.bz2 ./ | tee log)   ( cd ${LIVECDROOT}/install-temp; tar cvjpf ${CDISOROOT}/system/alx-i486.tar.bz2 ./ | tee log)
# Line 352  chroot ${CDCHROOTDIR} passwd -d root Line 299  chroot ${CDCHROOTDIR} passwd -d root
299  install -d ${CDCHROOTDIR}/var/lib/plymouth || die  install -d ${CDCHROOTDIR}/var/lib/plymouth || die
300  install -m 0644 $(get_profile boot-duration.livecd) ${CDCHROOTDIR}/var/lib/plymouth/boot-duration || die  install -m 0644 $(get_profile boot-duration.livecd) ${CDCHROOTDIR}/var/lib/plymouth/boot-duration || die
301    
 # install mnt-cdrom mount service, should be provided by alxinstall-ng  
 #install -m 0644 $(get_profile mnt-cdrom.mount) ${CDCHROOTDIR}/usr/lib/systemd/system/mnt-cdrom.mount || die  
 #ln -snf ../mnt-cdrom.mount ${CDCHROOTDIR}/usr/lib/systemd/system/local-fs.target.wants/mnt-cdrom.mount || die  
   
 # disable splash X11 vt change and set splash to be always verbose  
 #if [[ -f ${CDCHROOTDIR}/etc/splash/splash.conf ]]  
 #then  
 # sed -i -e 's:^\(SPLASH_X11_TTY=.*\):#\1:' \  
 # -e 's:^\(SPLASH_MODE=\).*:\1\"verbose\":' \  
 # ${CDCHROOTDIR}/etc/splash/splash.conf  
 #fi  
   
302  # setup de keymap and locales  # setup de keymap and locales
303  if [ -f ${CDCHROOTDIR}/etc/vconsole.conf ]  if [ -f ${CDCHROOTDIR}/etc/vconsole.conf ]
304  then  then

Legend:
Removed from v.3063  
changed lines
  Added in v.3064