A blank line is needed after single return, more than 1 return cmd
together doesn't need.
Signed-off-by: Xu Xijian <hdxuxijian(a)163.com>
---
lib/bootstrap.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh
index ad1c4a2f2..bd168a62a 100755
--- a/lib/bootstrap.sh
+++ b/lib/bootstrap.sh
@@ -235,7 +235,6 @@ run_ntpdate()
[ -z "$NO_NETWORK" ] || return
[ -n "$LKP_SERVER" ] || return
is_clearlinux && clearlinux_timesync && return
-
[ -x '/usr/sbin/ntpdate' ] || return
local hour="$(date +%H)"
@@ -371,6 +370,7 @@ install_deb()
# solved the dependent relationship, so here we ignore the dependency errors
echo "install debs round one: dpkg -i --force-confdef --force-depends $files"
dpkg -i --force-confdef --force-depends $files 2>/tmp/dpkg_error && return
+
grep -v "$filter_info" /tmp/dpkg_error
# round two, install all debs one by one accroding to keep-deb which is in sequence
@@ -397,6 +397,7 @@ install_deb()
install_rpms()
{
[ -d /opt/rpms ] || return
+
echo "install $(ls /opt/rpms/*.rpm)"
rpm -ivh --force --ignoresize /opt/rpms/*.rpm
}
@@ -458,6 +459,7 @@ fixup_packages()
mount_debugfs()
{
is_docker && return
+
check_mount debug /sys/kernel/debug -t debugfs
}
@@ -467,6 +469,7 @@ cleanup_pkg_cache()
local pkg_cache=$1
local cleanup_stamp=$pkg_cache/cleanup_stamp/$(date +%U)
[ -d "$cleanup_stamp" ] && return
+
mkdir $cleanup_stamp -p
find "$pkg_cache" \( -type f -mtime +7 -delete \) -or \( -type d -ctime +7 -empty -delete \)
@@ -497,6 +500,7 @@ mount_rootfs()
set_job_state 'load_disk_fail'
return 1
}
+
ROOTFS_DIR=/opt/rootfs
mkdir -p $ROOTFS_DIR
mount $rootfs_partition $ROOTFS_DIR || {
@@ -536,7 +540,6 @@ netconsole_init()
{
# don't init netconsole at local run
[ "$LKP_LOCAL_RUN" = "1" ] && return
-
[ -z "$netconsole_port" ] && return
[ -n "$NO_NETWORK" ] && return
@@ -545,6 +548,7 @@ netconsole_init()
# Select the interface that can access netconsole server
netconsole_interface=$(show_default_interface)
[ -n "$netconsole_server" ] || return
+
# eth0 is default interface if netconsole_interface is null.
modprobe netconsole netconsole=@/$netconsole_interface,$netconsole_port@$netconsole_server/
}
@@ -755,6 +759,7 @@ boot_init()
install_pkgs()
{
[ -d /opt/pkgs ] || return
+
echo "install $(ls /opt/pkgs/*.pkg.tar*)"
pacman -U --needed --noconfirm /opt/pkgs/*.pkg.tar*
}
--
2.23.0