updated with some error checking

Author: NetworkJack2

autorun/init.arch.sh

@@ -134,26 +134,31 @@ enable_services() {
 }
 
 config_initcpio() {
-  local -i exit_n=0
+  local -i errors=0
   submsg "Updating mkinitcpio"
   # add extra modules from local file
   initcpio_modules+=" "
   initcpio_modules+=${EXTRAINTMODULES}
-  sed -i s/"MODULES=()"/"MODULES=(${initcpio_modules})"/g /etc/mkinitcpio.conf || exit_n+=1
-  mkinitcpio -p ${KERNEL} || exit_n+=1
-  return ${exit_n}
+  sed -i s/"MODULES=()"/"MODULES=(${initcpio_modules})"/g /etc/mkinitcpio.conf || errors+=1
+  mkinitcpio -p ${KERNEL} || errors+=1
+
+  [ ${errors} -ne 0 ] && return 1
+  return 0
 }
 
 config_misc() {
+  local -i errors=0
   submsg "Misc Config"
-  touch /etc/machine-id
+  touch /etc/machine-id || errors+=1
   # Use timezone module to set Timezone from config
   rm -f /etc/localtime
   ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime
   if [ ${?} -ne 0 ];then
     warn "Could not set timezone: ${TIMEZONE}, check that it exists"
-    return 1
+    errors+=1
   fi
+  [ ${errors} -ne 0 ] && return 1
+  return 0
 }
 
 run_user_script(){

autorun/init.debian.sh

@@ -6,8 +6,9 @@
 # Name of kernel package
 KERNEL="linux-image"
 
-# Name of bootloader. As of now, only syslinux is supported
+# Name of bootloader. As of now, only extlinux is supported
 #BOOTLOADER="grub"??
+BOOTLOADER="extlinux"
 
 ## /DEFAULTS ##
 
@@ -157,24 +158,26 @@ enable_services() {
 
 config_initramdisk() {
   submsg "Reconfiguring Kernel and Rebuilding Initial Ramdisk"
-  local exit_n=0
-  dpkg-reconfigure --frontend=noninteractive ${KERNEL} || exit_n+=${?}
-  update-initramfs -u || exit_n+=${?}
+  local -i errors=0
+  dpkg-reconfigure --frontend=noninteractive ${KERNEL} || errors+=1
+  update-initramfs -u || errors+=1
 
   [ ${exit_n} -ne 0 ] && return 1
   return 0
 }
 
 config_misc() {
   submsg "Misc Config"
-  touch /etc/machine-id
+  local -i errors=0
+  touch /etc/machine-id || errors+=1
   # Use timezone module to set Timezone from config
-  rm -f /etc/localtime
   ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime
   if [ ${?} -ne 0 ];then
     warn "Could not set timezone: ${TIMEZONE}, check that it exists"
-    return 1
+    errors+=1
   fi
+  [ ${errors} -ne 0 ] && return 1
+  return 0
 }
 
 run_user_script(){
@@ -197,12 +200,12 @@ main() {
   source /etc/profile
   if [ -f "${local_config}" ];then
     message "parsing ${local_config}"
-    parse_environment "${local_config}"
+    parse_environment "${local_config}" || exit_code+=1
    else
     warn "${local_config} does not exist, this should be auto-generated by gen_cloud_template.sh"
   fi
 
-  dpkg-reconfigure --frontend=noninteractive ${BOOTLOADER}
+  dpkg-reconfigure --frontend=noninteractive ${BOOTLOADER} || exit_code+=1
   case ${BOOTLOADER} in
    *extlinux*)
     install_extlinux