Deal with the aftermath of aggressive-indent
This commit is contained in:
parent
e2f66dcb6c
commit
1c80216623
|
@ -95,8 +95,8 @@ enable_eatmydata_override() {
|
|||
> $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
|
||||
Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
|
||||
EOF
|
||||
Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
|
||||
EOF
|
||||
else
|
||||
echo $"error: unable to find /usr/bin/eatmydata after installing the eatmydata package"
|
||||
fi
|
||||
|
@ -121,12 +121,12 @@ set_apt_sources() {
|
|||
COMPONENTS="main"
|
||||
|
||||
cat <<EOF > etc/apt/sources.list
|
||||
deb $NEW_MIRROR $SUITE $COMPONENTS
|
||||
deb-src $NEW_MIRROR $SUITE $COMPONENTS
|
||||
deb $NEW_MIRROR $SUITE $COMPONENTS
|
||||
deb-src $NEW_MIRROR $SUITE $COMPONENTS
|
||||
|
||||
#deb http://security.debian.org/ $SUITE/updates main
|
||||
#deb-src http://security.debian.org/ $SUITE/updates main
|
||||
EOF
|
||||
#deb http://security.debian.org/ $SUITE/updates main
|
||||
#deb-src http://security.debian.org/ $SUITE/updates main
|
||||
EOF
|
||||
}
|
||||
|
||||
configure_networking() {
|
||||
|
@ -251,8 +251,8 @@ create_generic_image() {
|
|||
touch $rootdir/root/.initial_setup
|
||||
|
||||
cat >> $rootdir/home/$MY_USERNAME/.bashrc <<EOF
|
||||
# initial setup of the system
|
||||
if [ -f ~/.initial_setup ]; then
|
||||
# initial setup of the system
|
||||
if [ -f ~/.initial_setup ]; then
|
||||
clear
|
||||
echo "
|
||||
.---. . .
|
||||
|
@ -266,8 +266,8 @@ create_generic_image() {
|
|||
Please enter your password a second time.
|
||||
"
|
||||
sudo su
|
||||
fi
|
||||
EOF
|
||||
fi
|
||||
EOF
|
||||
|
||||
echo '# initial setup of the system' >> $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
|
||||
|
||||
cat > $rootdir/usr/sbin/policy-rc.d <<EOF
|
||||
#!/bin/sh
|
||||
exit 101
|
||||
EOF
|
||||
#!/bin/sh
|
||||
exit 101
|
||||
EOF
|
||||
chmod a+rx $rootdir/usr/sbin/policy-rc.d
|
||||
|
||||
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
|
||||
|
||||
chroot "$rootdir" /bin/bash -x <<EOF
|
||||
git clone $PROJECT_REPO /root/$PROJECT_NAME
|
||||
cd /root/$PROJECT_NAME
|
||||
make install
|
||||
EOF
|
||||
git clone $PROJECT_REPO /root/$PROJECT_NAME
|
||||
cd /root/$PROJECT_NAME
|
||||
make install
|
||||
EOF
|
||||
|
||||
chroot "$rootdir" ${PROJECT_NAME}-image-hardware-setup 2>&1 | \
|
||||
tee $rootdir/var/log/${PROJECT_NAME}-image-hardware-setup.log
|
||||
|
|
Loading…
Reference in New Issue