From 3c8902385de349b808ad85fd3fd9fc5695533536 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 19 Feb 2015 11:38:16 -0600
Subject: [PATCH] ubuntu: startup just call unfied
/opt/scripts/boot/generic-startup.sh
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
target/init_scripts/generic-ubuntu.conf | 30 +------------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/target/init_scripts/generic-ubuntu.conf b/target/init_scripts/generic-ubuntu.conf
index d3890d253..c94fe7726 100644
--- a/target/init_scripts/generic-ubuntu.conf
+++ b/target/init_scripts/generic-ubuntu.conf
@@ -23,34 +23,6 @@ if [ -f /etc/timestamp ] ; then
fi
fi
-#Regenerate ssh host keys
-if [ -f /etc/ssh/ssh.regenerate ] ; then
- rm -rf /etc/ssh/ssh_host_* || true
- dpkg-reconfigure openssh-server
- sync
- if [ -s /etc/ssh/ssh_host_ecdsa_key.pub ] ; then
- rm -f /etc/ssh/ssh.regenerate || true
- sync
- fi
-fi
-
- #Resize drive when requested
- if [ -f /resizerootfs ] ; then
- drive=$(cat /resizerootfs)
- if [ ! "x${drive}" = "x" ] ; then
- if [ "x${drive}" = "x/dev/mmcblk0" ] || [ "x${drive}" = "x/dev/mmcblk1" ] ; then
- resize2fs ${drive}p2 >/var/log/resize.log 2>&1 || true
- else
- resize2fs ${drive} >/var/log/resize.log 2>&1 || true
- fi
- fi
- rm -rf /resizerootfs || true
- fi
+/bin/sh /opt/scripts/boot/generic-startup.sh
-if [ -f /boot/SOC.sh ] ; then
- board=$(grep board /boot/SOC.sh | awk -F"=" '{print $2}')
- if [ -f "/opt/scripts/boot/${board}.sh" ] ; then
- /bin/sh /opt/scripts/boot/${board}.sh >/dev/null 2>&1 &
- fi
-fi
end script
--
GitLab