From 4c35d6757cd53b0d012b656f2f21770c91489f3a Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Fri, 26 Dec 2014 15:04:41 +0100 Subject: [PATCH] Replace numbered build scripts with updated ones --- build/scripts/01_boot.sh | 8 -------- build/scripts/99_cleanup.sh | 10 ---------- build/scripts/{03_btsync.sh => btsync.sh} | 0 build/scripts/{03_chrome.sh => chrome.sh} | 0 build/scripts/cleanup.sh | 12 ++++++++++++ build/scripts/compile.sh | 7 +++++++ build/scripts/{01_cron.sh => cron.sh} | 4 +--- build/scripts/{03_firefox.sh => firefox.sh} | 0 build/scripts/{03_hamachi.sh => hamachi.sh} | 0 build/scripts/{02_hosts.sh => hosts.sh} | 0 build/scripts/{01_init.sh => init.sh} | 1 - build/scripts/{01_logrotate.sh => logrotate.sh} | 0 build/scripts/{00_prepare.sh => prepare.sh} | 9 +++++++-- build/scripts/{03_pulseaudio.sh => pulseaudio.sh} | 0 build/scripts/{03_redis.sh => redis.sh} | 0 build/scripts/{01_runit.sh => runit.sh} | 0 build/scripts/{01_sshd.sh => sshd.sh} | 2 -- build/scripts/{01_syslog.sh => syslog.sh} | 2 -- build/scripts/test.sh | 6 ++++++ build/scripts/{02_user.sh => user.sh} | 0 build/scripts/{02_utilities.sh => utilities.sh} | 2 +- 21 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 build/scripts/01_boot.sh delete mode 100644 build/scripts/99_cleanup.sh rename build/scripts/{03_btsync.sh => btsync.sh} (100%) rename build/scripts/{03_chrome.sh => chrome.sh} (100%) create mode 100644 build/scripts/cleanup.sh create mode 100644 build/scripts/compile.sh rename build/scripts/{01_cron.sh => cron.sh} (63%) rename build/scripts/{03_firefox.sh => firefox.sh} (100%) rename build/scripts/{03_hamachi.sh => hamachi.sh} (100%) rename build/scripts/{02_hosts.sh => hosts.sh} (100%) rename build/scripts/{01_init.sh => init.sh} (93%) rename build/scripts/{01_logrotate.sh => logrotate.sh} (100%) rename build/scripts/{00_prepare.sh => prepare.sh} (83%) rename build/scripts/{03_pulseaudio.sh => pulseaudio.sh} (100%) rename build/scripts/{03_redis.sh => redis.sh} (100%) rename build/scripts/{01_runit.sh => runit.sh} (100%) rename build/scripts/{01_sshd.sh => sshd.sh} (88%) rename build/scripts/{01_syslog.sh => syslog.sh} (79%) create mode 100644 build/scripts/test.sh rename build/scripts/{02_user.sh => user.sh} (100%) rename build/scripts/{02_utilities.sh => utilities.sh} (62%) diff --git a/build/scripts/01_boot.sh b/build/scripts/01_boot.sh deleted file mode 100644 index 0ad29df..0000000 --- a/build/scripts/01_boot.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -## Boot entries -mkdir /opt/init.d/ -mv /build/boot/*.sh /opt/init.d/ diff --git a/build/scripts/99_cleanup.sh b/build/scripts/99_cleanup.sh deleted file mode 100644 index 70eaf47..0000000 --- a/build/scripts/99_cleanup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e -source /build/config -set -x - -apt-get clean -rm -rf /build -rm -rf /tmp/* /var/tmp/* -rm -rf /var/lib/apt/lists/* -rm -f /etc/dpkg/dpkg.cfg.d/02apt-speedup diff --git a/build/scripts/03_btsync.sh b/build/scripts/btsync.sh similarity index 100% rename from build/scripts/03_btsync.sh rename to build/scripts/btsync.sh diff --git a/build/scripts/03_chrome.sh b/build/scripts/chrome.sh similarity index 100% rename from build/scripts/03_chrome.sh rename to build/scripts/chrome.sh diff --git a/build/scripts/cleanup.sh b/build/scripts/cleanup.sh new file mode 100644 index 0000000..0e7f525 --- /dev/null +++ b/build/scripts/cleanup.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e +source /build/config +set -x + + +echo $MODE +apt-get clean +# rm -rf /build +rm -rf /tmp/* /var/tmp/* +# rm -rf /var/lib/apt/lists/* +# rm -f /etc/dpkg/dpkg.cfg.d/02apt-speedup diff --git a/build/scripts/compile.sh b/build/scripts/compile.sh new file mode 100644 index 0000000..1cebd24 --- /dev/null +++ b/build/scripts/compile.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +source /build/config +set -x + +## Often used tools +$minimal_apt_get_install gcc make automake libtool diff --git a/build/scripts/01_cron.sh b/build/scripts/cron.sh similarity index 63% rename from build/scripts/01_cron.sh rename to build/scripts/cron.sh index 0efba45..3994da3 100644 --- a/build/scripts/01_cron.sh +++ b/build/scripts/cron.sh @@ -4,9 +4,7 @@ source /build/config set -x ## Install cron daemon -$minimal_apt_get_install cron -mkdir -p /etc/service/cron -mv /build/runit/cron /etc/service/cron/run +apt_get_install_permanent cron ## Remove useless cron entries # Checks for lost+found and scans for mtab diff --git a/build/scripts/03_firefox.sh b/build/scripts/firefox.sh similarity index 100% rename from build/scripts/03_firefox.sh rename to build/scripts/firefox.sh diff --git a/build/scripts/03_hamachi.sh b/build/scripts/hamachi.sh similarity index 100% rename from build/scripts/03_hamachi.sh rename to build/scripts/hamachi.sh diff --git a/build/scripts/02_hosts.sh b/build/scripts/hosts.sh similarity index 100% rename from build/scripts/02_hosts.sh rename to build/scripts/hosts.sh diff --git a/build/scripts/01_init.sh b/build/scripts/init.sh similarity index 93% rename from build/scripts/01_init.sh rename to build/scripts/init.sh index 278c35a..2722752 100644 --- a/build/scripts/01_init.sh +++ b/build/scripts/init.sh @@ -4,7 +4,6 @@ source /build/config set -x ## Install init process -mv /build/init /opt/ mkdir -p /etc/container_environment touch /etc/container_environment.sh touch /etc/container_environment.json diff --git a/build/scripts/01_logrotate.sh b/build/scripts/logrotate.sh similarity index 100% rename from build/scripts/01_logrotate.sh rename to build/scripts/logrotate.sh diff --git a/build/scripts/00_prepare.sh b/build/scripts/prepare.sh similarity index 83% rename from build/scripts/00_prepare.sh rename to build/scripts/prepare.sh index 206cf00..fc0ad79 100644 --- a/build/scripts/00_prepare.sh +++ b/build/scripts/prepare.sh @@ -13,7 +13,9 @@ export INITRD=no mkdir -p /etc/container_environment echo -n no > /etc/container_environment/INITRD -## Update package list +## Enable Ubuntu Universe and Multiverse. +sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list +sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list apt-get update ## Fix some issues with APT packages @@ -36,4 +38,7 @@ apt-get dist-upgrade -y --no-install-recommends ## Fix locale $minimal_apt_get_install language-pack-en -locale-gen en_US \ No newline at end of file +locale-gen en_US + +## Create directory for boot scripts +mkdir /opt/init.d/ \ No newline at end of file diff --git a/build/scripts/03_pulseaudio.sh b/build/scripts/pulseaudio.sh similarity index 100% rename from build/scripts/03_pulseaudio.sh rename to build/scripts/pulseaudio.sh diff --git a/build/scripts/03_redis.sh b/build/scripts/redis.sh similarity index 100% rename from build/scripts/03_redis.sh rename to build/scripts/redis.sh diff --git a/build/scripts/01_runit.sh b/build/scripts/runit.sh similarity index 100% rename from build/scripts/01_runit.sh rename to build/scripts/runit.sh diff --git a/build/scripts/01_sshd.sh b/build/scripts/sshd.sh similarity index 88% rename from build/scripts/01_sshd.sh rename to build/scripts/sshd.sh index 0e8edba..9c56382 100644 --- a/build/scripts/01_sshd.sh +++ b/build/scripts/sshd.sh @@ -6,8 +6,6 @@ set -x ## Install the SSH server $minimal_apt_get_install openssh-server mkdir /var/run/sshd -mkdir -p /etc/service/sshd -cp /build/runit/sshd /etc/service/sshd/run ## Install root key cd /opt diff --git a/build/scripts/01_syslog.sh b/build/scripts/syslog.sh similarity index 79% rename from build/scripts/01_syslog.sh rename to build/scripts/syslog.sh index 9908a7f..0327b08 100644 --- a/build/scripts/01_syslog.sh +++ b/build/scripts/syslog.sh @@ -5,7 +5,5 @@ set -x ## Install a syslog daemon $minimal_apt_get_install syslog-ng-core -mkdir /etc/service/syslog-ng -mv /build/runit/syslog-ng /etc/service/syslog-ng/run mkdir -p /var/lib/syslog-ng sed -i "s/^\(#SYSLOGNG_OPTS=\).*$/\1\"--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat\"/" /etc/default/syslog-ng diff --git a/build/scripts/test.sh b/build/scripts/test.sh new file mode 100644 index 0000000..6f45136 --- /dev/null +++ b/build/scripts/test.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +source /build/config +set -x + +echo $MODE diff --git a/build/scripts/02_user.sh b/build/scripts/user.sh similarity index 100% rename from build/scripts/02_user.sh rename to build/scripts/user.sh diff --git a/build/scripts/02_utilities.sh b/build/scripts/utilities.sh similarity index 62% rename from build/scripts/02_utilities.sh rename to build/scripts/utilities.sh index 2b840e9..76c7dab 100644 --- a/build/scripts/02_utilities.sh +++ b/build/scripts/utilities.sh @@ -4,7 +4,7 @@ source /build/config set -x ## Often used tools -$minimal_apt_get_install wget curl python-pip inetutils-ping telnet sox +$minimal_apt_get_install wget curl python-pip git inetutils-ping telnet ## Often used python modules pip install argparse