plamo: Improve template

allow not to specify a variable that is related installed packages Signed-off-by: TAMUKI Shoichi <tamuki@linet.gr.jp> Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

plamo: Improve template
8c3a756e · KATOH Yasufumi · Stéphane Graber · 6eaac303 · 8c3a756e
Commit 8c3a756e authored Jan 23, 2014 by KATOH Yasufumi Committed by Stéphane Graber Jan 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

lxc-plamo.in templates/lxc-plamo.in +6 -6

No files found.
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -33,11 +33,11 @@
 DLSCHEME=${DLSCHEME:-"http"}
 MIRRORSRV=${MIRRORSRV:-"www.ring.gr.jp"}
 MIRRORPATH=${MIRRORPATH:-"/pub/linux/Plamo"}
-CATEGORIES=${CATEGORIES:-"00_base 01_minimum"}
+CATEGORIES=${CATEGORIES-"00_base 01_minimum"}
-EXTRACTGRS=${EXTRACTGRS:-""}
+EXTRACTGRS=${EXTRACTGRS-""}
-IGNOREPKGS=${IGNOREPKGS:-"grub kernel lilo linux_firmware microcode_ctl
+IGNOREPKGS=${IGNOREPKGS-"grub kernel lilo linux_firmware microcode_ctl
    cpufreqd cpufrequtils gpm"}
-ADDONPKGS=${ADDONPKGS:-"`echo contrib/Hamradio/{morse,qrq}`"}
+ADDONPKGS=${ADDONPKGS-"`echo contrib/Hamradio/{morse,qrq}`"}
 download_plamo() {
  # check the mini plamo was not already downloaded
@@ -50,7 +50,7 @@ download_plamo() {
  cd $ptcache
  case $DLSCHEME in http) depth=2 ;; ftp) depth=3 ;; esac
  rej=${IGNOREPKGS%% *} ; [ -n "$rej" ] && rej="$rej-*"
-  if [ `echo $IGNOREPKGS | wc -w` -ne 1 ] ; then
+  if [ `echo $IGNOREPKGS | wc -w` -gt 1 ] ; then
    for p in ${IGNOREPKGS#* } ; do rej="$rej,$p-*" ; done
  fi
  for i in $CATEGORIES ; do
@@ -347,7 +347,7 @@ dlcache=$cache/cache-${prog##*-}-$release-$arch
 rtcache=$cache/rootfs-${prog##*-}-$release-$arch
 if [ -z "$rootfs" ] ; then
  if grep -q "^lxc.rootfs" $path/config ; then
-    rootfs=$(awk -F= '/^lxc.rootfs =/{ print $2 }' $path/config)
+    rootfs=`awk -F= '/^lxc.rootfs =/{ print $2 }' $path/config`
  else
    rootfs=$path/rootfs
  fi