Move installation of the CIFS package to run/cifs_archive/configure-archive.sh

Don't need hping3 for other systems.

Keep the reconfiguration of the packages that is done specifically for making the root file system read-only in make-root-fs-readonly.sh.
This commit is contained in:
cimryan
2018-11-03 17:43:35 -07:00
parent 2eec8864c8
commit 2a463ba40b
3 changed files with 15 additions and 13 deletions

View File

@@ -22,6 +22,12 @@ function configure_archive () {
echo "Configured the archive." echo "Configured the archive."
} }
function install_required_packages () {
apt-get -y --force-yes install hping3
}
install_required_packages
ARCHIVE_SERVER_IP_ADDRESS="$( $INSTALL_DIR/lookup-ip-address.sh "$archiveserver" )" ARCHIVE_SERVER_IP_ADDRESS="$( $INSTALL_DIR/lookup-ip-address.sh "$archiveserver" )"
configure_archive "$ARCHIVE_SERVER_IP_ADDRESS" configure_archive "$ARCHIVE_SERVER_IP_ADDRESS"

View File

@@ -7,6 +7,15 @@ function append_cmdline_txt_param() {
sed -i "s/\'/ ${toAppend}/g" /boot/cmdline.txt >/dev/null sed -i "s/\'/ ${toAppend}/g" /boot/cmdline.txt >/dev/null
} }
echo "Updating package index files..."
apt-get update
echo "Removing unwanted packages..."
apt-get remove -y --force-yes --purge triggerhappy logrotate dphys-swapfile
apt-get -y --force-yes autoremove --purge
# Replace log management with busybox (use logread if needed)
echo "Installing ntp and busybox-syslogd..."
apt-get -y --force-yes install ntp busybox-syslogd; dpkg --purge rsyslog
echo "Configuring system..." echo "Configuring system..."
# Add fastboot, noswap and/or ro to end of /boot/cmdline.txt # Add fastboot, noswap and/or ro to end of /boot/cmdline.txt

View File

@@ -191,22 +191,9 @@ function make_root_fs_readonly () {
/tmp/make-root-fs-readonly.sh /tmp/make-root-fs-readonly.sh
} }
function install_required_packages () {
echo "Updating package index files..."
apt-get update
echo "Removing unwanted packages..."
apt-get remove -y --force-yes --purge triggerhappy logrotate dphys-swapfile
apt-get -y --force-yes autoremove --purge
# Replace log management with busybox (use logread if needed)
echo "Installing ntp, and busybox-syslogd..."
apt-get -y --force-yes install ntp busybox-syslogd hping3; dpkg --purge rsyslog
}
export -f setup_progress export -f setup_progress
export HEADLESS_SETUP export HEADLESS_SETUP
install_required_packages
headless_setup_populate_variables headless_setup_populate_variables
# If USE_LED_FOR_SETUP_PROGRESS = true. # If USE_LED_FOR_SETUP_PROGRESS = true.