scripts: sync with devops

Pull in some recent devop changes so the developer test builds are in-sync. Signed-off-by: Mark D Horn <[email protected]>
be-we · Sep 13, 2019 · 98089cc · 98089cc
1 parent c46cf8e
commit 98089cc
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 41 deletions.
diff --git a/scripts/add-desktop-login-issue.sh b/scripts/add-desktop-login-issue.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+echo "Creating custom issue file for $1"
+
+echo "Welcome to the Clear Linux* OS live image!
+
+ * Documentation: https://clearlinux.org/documentation
+ * Community Support: https://clearlinux.org/community
+
+To install Clear Linux* OS onto this system please login as 'clrlinux',
+which has no password, and run:
+ sudo -E clr-installer
+
+" >> $1/etc/issue
+
+exit 0
diff --git a/scripts/add-server-login-issue.sh b/scripts/add-server-login-issue.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+echo "Creating custom issue file for $1"
+
+echo "Welcome to the Clear Linux* OS live image!
+
+ * Documentation: https://clearlinux.org/documentation
+ * Community Support: https://clearlinux.org/community
+
+To configure the network run:
+ nmtui
+
+To install Clear Linux* OS onto this system please login as root,
+enter a new temporary password, and run:
+ clr-installer
+
+" >> $1/etc/issue
+
+exit 0
diff --git a/scripts/ciao-networking.yaml b/scripts/ciao-networking.yaml
diff --git a/scripts/live-desktop-post-install.sh b/scripts/live-desktop-post-install.sh
@@ -17,6 +17,12 @@ ${HOOKDIR}/local-telemetry-post.sh ${CHROOTPATH}
 # Delay booting to give user a change to change boot params
 ${HOOKDIR}/wait-to-boot-post.sh ${CHROOTPATH}
 
+# Add issue (pre-login message) to inform user of how to run the installer
+${HOOKDIR}/add-desktop-login-issue.sh ${CHROOTPATH}
+
+# Add changes to PS1 to indicate live image by setting the hostname
+echo "clr-live" > ${CHROOTPATH}/etc/hostname
+
 GDM_DIR=$CHROOTPATH/etc/gdm/
 THEMES_DIR=$CHROOTPATH/usr/share/clr-installer/themes
 DESKTOP_DIR=$CHROOTPATH/usr/share/applications/
@@ -25,7 +31,7 @@ VAR_DIR=$CHROOTPATH/var/lib/clr-installer
 # Add the user account for auto-login
 echo "Creating user account clrlinux"
 chroot $CHROOTPATH usermod -a -G wheelnopw clrlinux
-chroot $CHROOTPATH usermod -u 1001 clrlinux
+chroot $CHROOTPATH usermod -u 1000 clrlinux
 chroot $CHROOTPATH passwd -d clrlinux
 
 chroot $CHROOTPATH systemd-machine-id-setup

diff --git a/scripts/live-server-post-install.sh b/scripts/live-server-post-install.sh
@@ -17,6 +17,12 @@ ${HOOKDIR}/local-telemetry-post.sh ${CHROOTPATH}
 # Delay booting to give user a change to change boot params
 ${HOOKDIR}/wait-to-boot-post.sh ${CHROOTPATH}
 
+# Add issue (pre-login message) to inform user of how to run the installer
+${HOOKDIR}/add-server-login-issue.sh ${CHROOTPATH}
+
+# Add changes to PS1 to indicate live image by setting the hostname
+echo "clr-live" > ${CHROOTPATH}/etc/hostname
+
 chroot $CHROOTPATH systemd-machine-id-setup
 
 exit 0