Magellan Linux

Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

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

revision 360 by niro, Mon Mar 27 21:23:02 2006 UTC revision 1402 by niro, Sun Jun 5 02:31:52 2011 UTC
# Line 19  CDID="mlcd-$(date +%F-%k%M)" Line 19  CDID="mlcd-$(date +%F-%k%M)"
19  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"  PROFILES_DIR="/usr/lib/mlivecdbuild/profiles"
20  GLOBAL_PROFILE="${PROFILES_DIR}/global"  GLOBAL_PROFILE="${PROFILES_DIR}/global"
21    
22    # get full path to isolinux.bin, may vary an multilib systems
23    if [[ -f /usr/lib64/mkinitrd/isolinux.bin ]]
24    then
25     ISOLINUX_BIN=/usr/lib64/mkinitrd/isolinux.bin
26    else
27     ISOLINUX_BIN=/usr/lib/mkinitrd/isolinux.bin
28    fi
29    
30  die() { echo "ERROR: $@"; exit 1; }  die() { echo "ERROR: $@"; exit 1; }
31    
32  # get_profile $filename  # get_profile $filename
# Line 52  custom_services() Line 60  custom_services()
60   local services="$2"   local services="$2"
61    
62   case ${cmd} in   case ${cmd} in
63   add|del|default) continue;;   add|del|default)
64     # add given services from profile
65     if [[ -n ${services} ]]
66     then
67     local i
68     for i in ${services}
69     do
70     MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
71     done
72     fi
73     ;;
74   *) die "custom_services: unkown command ${cmd}";;   *) die "custom_services: unkown command ${cmd}";;
75   esac   esac
   
  # add given services from profile  
  if [[ -n ${services} ]]  
  then  
  local i  
  for i in ${services}  
  do  
  MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"  
  done  
  fi  
76  }  }
77    
78  add_initrc()  add_initrc()
# Line 72  add_initrc() Line 80  add_initrc()
80   local var="$1"   local var="$1"
81    
82   # sanity checks   # sanity checks
83   [ -z "${CDCHROOTDIR}" ] && die "\$CDCHROOTDIR not given."   [[ -z ${CDCHROOTDIR} ]] && die "\$CDCHROOTDIR not given."
84   echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"   echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"
85  }  }
86    
# Line 82  custom_packages() Line 90  custom_packages()
90   local packages="$2"   local packages="$2"
91    
92   case ${cmd} in   case ${cmd} in
93   install|uninstall) continue;;   install|uninstall)
94     if [[ -n ${packages} ]]
95     then
96     :> ${CDCHROOTDIR}/.installrc
97    
98     # respect proxies
99     [[ -n ${http_proxy} ]] && add_initrc "export http_proxy=${http_proxy}"
100     [[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"
101     [[ -n ${no_proxy} ]] && add_initrc "export no_proxy=${no_proxy}"
102    
103     # do not auto-start any services!
104     add_initrc "export MAGE_BOOTSTRAP=true"
105     add_initrc 'die() { if [ $? -eq 1 ]; then echo "ERROR: $@"; exit 1; fi; }'
106    
107     local i
108     for i in ${packages}
109     do
110     add_initrc "mage ${cmd} ${i} || die ${i}"
111     done
112     add_initrc "mage clean"
113    
114     # now run the .installrc script
115     mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"
116     mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"
117     mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"
118     chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"
119     umount ${CDCHROOTDIR}/dev || die "umount dev"
120     umount ${CDCHROOTDIR}/proc || die "umount proc"
121     umount ${CDCHROOTDIR}/sys || die "umount sys"
122     [ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc
123     fi
124     ;;
125   *) die "custom_packages: unkown command ${cmd}";;   *) die "custom_packages: unkown command ${cmd}";;
126   esac   esac
   
  if [[ -n ${packages} ]]  
  then  
   
  :> ${CDCHROOTDIR}/.installrc  
  local i  
  for i in ${packages}  
  do  
  add_initrc "mage install ${i}"  
  done  
  add_initrc "mage clean"  
   
  # now run the .installrc script  
  mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"  
  mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"  
  mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"  
  chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"  
  umount ${CDCHROOTDIR}/dev || die "umount dev"  
  umount ${CDCHROOTDIR}/proc || die "umount proc"  
  umount ${CDCHROOTDIR}/sys || die "umount sys"  
  [ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc  
  fi  
127  }  }
128    
129  read_config()  read_config()
# Line 128  prepare_iso() Line 145  prepare_iso()
145   echo Preparing LiveCD ISO Image ...   echo Preparing LiveCD ISO Image ...
146    
147   # fixes some issues with xfree/xorg xkb   # fixes some issues with xfree/xorg xkb
148   if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]   if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] && [[ -d /usr/X11R6/lib/X11/xkb ]]
149   then   then
150   rm ${CDCHROOTDIR}/etc/X11/xkb || die   rm ${CDCHROOTDIR}/etc/X11/xkb || die
151   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die   mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die
# Line 139  prepare_iso() Line 156  prepare_iso()
156   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die   install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
157   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die   install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die
158   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die   install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die
159     install -m 0644 $(get_profile net.eth0) ${CDCHROOTDIR}/etc/conf.d/net.eth0 || die
160   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die   echo "${CDHOSTNAME}" > ${CDCHROOTDIR}/etc/hostname || die
161    
162   echo Setting up services ...   echo Setting up services ...
163    
164  # not needed with initscripts 0.3.6-r2  # # add hardware detection
165  # # change mountfs with mountfslivecd  # MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
 # MROOT="${CDCHROOTDIR}" rc-config del mountfs || die "rc del mountfs"  
 # MROOT="${CDCHROOTDIR}" rc-config add mountfslivecd || die "rc add mountfslivecd"  
   
  # add hardware detection  
  MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"  
166    
167   # del checkfs   # del checkfs
168   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"   MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
# Line 200  install_bootloader() Line 213  install_bootloader()
213    
214   # iso linux binary   # iso linux binary
215   install -d ${CDISOROOT}/isolinux   install -d ${CDISOROOT}/isolinux
216   install /usr/lib/mkinitrd/isolinux.bin ${CDISOROOT}/isolinux || die   install ${ISOLINUX_BIN} ${CDISOROOT}/isolinux || die
217    
218   # kernel   # kernel
219   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"   local kimg="$(basename $(readlink ${CDCHROOTDIR}/boot/vmlinuz))"
# Line 254  generate_iso() Line 267  generate_iso()
267    
268  enter_livecd()  enter_livecd()
269  {  {
270   mount -t sysfs sysfs ${CDCHROOTDIR}/proc   mount -t sysfs sysfs ${CDCHROOTDIR}/sys
271   mount -t proc proc ${CDCHROOTDIR}/proc   mount -t proc proc ${CDCHROOTDIR}/proc
272   mount -o bind /dev ${CDCHROOTDIR}/dev   mount -o bind /dev ${CDCHROOTDIR}/dev
273    
# Line 263  enter_livecd() Line 276  enter_livecd()
276   HOME=/root \   HOME=/root \
277   TERM=$TERM PS1='\u:\w\$ ' \   TERM=$TERM PS1='\u:\w\$ ' \
278   PATH=/bin:/usr/bin:/sbin:/usr/sbin \   PATH=/bin:/usr/bin:/sbin:/usr/sbin \
279     http_proxy=${http_proxy} \
280     ftp_proxy=${ftp_proxy} \
281     no_proxy=${no_proxy} \
282   /bin/bash -i   /bin/bash -i
283    
284     umount ${CDCHROOTDIR}/dev
285     umount ${CDCHROOTDIR}/proc
286     umount ${CDCHROOTDIR}/sys
287  }  }
288    
289  usage()  usage()
# Line 278  usage() Line 298  usage()
298   echo "    bootloader - installs the bootloader"   echo "    bootloader - installs the bootloader"
299   echo "    isogen     - generate the final livecd iso image"   echo "    isogen     - generate the final livecd iso image"
300   echo "    all        - runs all tasks to get a livecd from zero"   echo "    all        - runs all tasks to get a livecd from zero"
301     echo "    enter      - enters the rootfs of a livecd"
302   echo   echo
303   echo "    for example '$(basename $0) all default'"   echo "    for example '$(basename $0) all default'"
304   echo "    creates a livecd using the default profile."   echo "    creates a livecd using the default profile."
# Line 287  usage() Line 308  usage()
308  # source profile config - overrides all other vars  # source profile config - overrides all other vars
309  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config  [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
310    
 #bootstrap_system  
 #prepare_iso  
 #generate_rootfs  
 #generate_initrd  
 #install_bootloader  
 #generate_iso  
   
311  case $1 in  case $1 in
312   bootstrap) bootstrap_system;;   bootstrap) bootstrap_system;;
313   prepare) prepare_iso;;   prepare) prepare_iso;;
# Line 309  case $1 in Line 323  case $1 in
323   install_bootloader   install_bootloader
324   generate_iso   generate_iso
325   ;;   ;;
326     enter) enter_livecd ;;
327   *|'') usage;;   *|'') usage;;
328  esac  esac

Legend:
Removed from v.360  
changed lines
  Added in v.1402