free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deal with the aftermath of aggressive-indent

This commit is contained in:
Bob Mottram 2016-04-28 14:36:45 +01:00
parent e2f66dcb6c
commit 1c80216623
No known key found for this signature in database
GPG Key ID: BA68F26108DC9F87
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/freedombone-image-customise
View File

@ -95,8 +95,8 @@ enable_eatmydata_override() {
> $rootdir/var/tmp/dpkg-eatmydata > $rootdir/var/tmp/dpkg-eatmydata
chmod 755 $rootdir/var/tmp/dpkg-eatmydata chmod 755 $rootdir/var/tmp/dpkg-eatmydata
cat > $rootdir/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata <<EOF cat > $rootdir/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata <<EOF
Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata"; Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
EOF EOF
else else
echo $"error: unable to find /usr/bin/eatmydata after installing the eatmydata package" echo $"error: unable to find /usr/bin/eatmydata after installing the eatmydata package"
fi fi
@ -121,12 +121,12 @@ set_apt_sources() {
COMPONENTS="main" COMPONENTS="main"
cat <<EOF > etc/apt/sources.list cat <<EOF > etc/apt/sources.list
deb $NEW_MIRROR $SUITE $COMPONENTS deb $NEW_MIRROR $SUITE $COMPONENTS
deb-src $NEW_MIRROR $SUITE $COMPONENTS deb-src $NEW_MIRROR $SUITE $COMPONENTS
#deb http://security.debian.org/ $SUITE/updates main #deb http://security.debian.org/ $SUITE/updates main
#deb-src http://security.debian.org/ $SUITE/updates main #deb-src http://security.debian.org/ $SUITE/updates main
EOF EOF
} }
configure_networking() { configure_networking() {
@ -251,10 +251,10 @@ create_generic_image() {
touch $rootdir/root/.initial_setup touch $rootdir/root/.initial_setup
cat >> $rootdir/home/$MY_USERNAME/.bashrc <<EOF cat >> $rootdir/home/$MY_USERNAME/.bashrc <<EOF
# initial setup of the system # initial setup of the system
if [ -f ~/.initial_setup ]; then if [ -f ~/.initial_setup ]; then
clear clear
echo " echo "
.---. . . .---. . .
| | | | | |
|--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-. |--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-.
@ -265,9 +265,9 @@ create_generic_image() {
Please enter your password a second time. Please enter your password a second time.
" "
sudo su sudo su
fi fi
EOF EOF
echo '# initial setup of the system' >> $rootdir/root/.bashrc echo '# initial setup of the system' >> $rootdir/root/.bashrc
echo 'if [ -f ~/.initial_setup ]; then' >> $rootdir/root/.bashrc echo 'if [ -f ~/.initial_setup ]; then' >> $rootdir/root/.bashrc
@ -491,9 +491,9 @@ chroot "$rootdir" apt-get clean
chroot "$rootdir" apt-get update chroot "$rootdir" apt-get update
cat > $rootdir/usr/sbin/policy-rc.d <<EOF cat > $rootdir/usr/sbin/policy-rc.d <<EOF
#!/bin/sh #!/bin/sh
exit 101 exit 101
EOF EOF
chmod a+rx $rootdir/usr/sbin/policy-rc.d chmod a+rx $rootdir/usr/sbin/policy-rc.d
if $use_eatmydata ; then if $use_eatmydata ; then
@ -515,10 +515,10 @@ chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools
sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf sed -i "s|#host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf
chroot "$rootdir" /bin/bash -x <<EOF chroot "$rootdir" /bin/bash -x <<EOF
git clone $PROJECT_REPO /root/$PROJECT_NAME git clone $PROJECT_REPO /root/$PROJECT_NAME
cd /root/$PROJECT_NAME cd /root/$PROJECT_NAME
make install make install
EOF EOF
chroot "$rootdir" ${PROJECT_NAME}-image-hardware-setup 2>&1 | \ chroot "$rootdir" ${PROJECT_NAME}-image-hardware-setup 2>&1 | \
tee $rootdir/var/log/${PROJECT_NAME}-image-hardware-setup.log tee $rootdir/var/log/${PROJECT_NAME}-image-hardware-setup.log