iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[automated-distro-installer]
/
fai
/
config
/
scripts
/
CLOUD
/
99-cleanup
diff --git
a/fai/config/scripts/CLOUD/99-cleanup
b/fai/config/scripts/CLOUD/99-cleanup
index 35a104c253c79ef7268f2ad2b26408cbb85691bf..3ffa00c655b7556c72be9bce6f66b7e9f719d01e 100755
(executable)
--- a/
fai/config/scripts/CLOUD/99-cleanup
+++ b/
fai/config/scripts/CLOUD/99-cleanup
@@
-1,20
+1,18
@@
#! /bin/bash
#! /bin/bash
-fcopy /etc/init.d/expand-root
-if [ -f $target/files/etc/init.d/expand-root ]; then
- $ROOTCMD insserv --default expand-root
-fi
-
-sed -i "s/PermitRootLogin yes/PermitRootLogin without-password/" $target/etc/ssh/sshd_config
+fai-sed "s/PermitRootLogin yes/PermitRootLogin without-password/" /etc/ssh/sshd_config
ainsl /etc/ssh/sshd_config 'ClientAliveInterval 120'
ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist pcspkr'
ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist floppy'
ainsl /etc/ssh/sshd_config 'ClientAliveInterval 120'
ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist pcspkr'
ainsl -a /etc/modprobe.d/blacklist.conf 'blacklist floppy'
-rm -f $target/etc/resolv.conf $target/etc/udev/rules.d/70-persistent-net.rules $target/lib/udev/write_net_rules
-shred --remove $target/etc/ssh/ssh_host_*
+cleanup_base
+
+rm -f $target/etc/resolv.conf \
+ $target/etc/udev/rules.d/70-persistent-net.rules \
+ $target/lib/udev/write_net_rules
# FIXME: DHCP RFC3442 is used incorrect in Azure
if [ -f $target/etc/dhcp/dhclient.conf ]; then
# FIXME: DHCP RFC3442 is used incorrect in Azure
if [ -f $target/etc/dhcp/dhclient.conf ]; then
-
sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' $target
/etc/dhcp/dhclient.conf
+
fai-sed 's,rfc3442-classless-static-routes,disabled-\0,'
/etc/dhcp/dhclient.conf
fi
fi