summaryrefslogtreecommitdiffstats
path: root/satellit_installer/satellit_installer
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-25 16:28:11 +0200
committerSimon Rettberg2019-10-25 16:28:11 +0200
commit554c63664f0545ddffbfded2daf7c7505933eb6b (patch)
tree0327c5ea51e99dc1d0bf2ade3e4318a5650c4031 /satellit_installer/satellit_installer
parent[SSPS] Fix check for rc-local; bail out on error; remove systemd check (diff)
downloadsetup-scripts-554c63664f0545ddffbfded2daf7c7505933eb6b.tar.gz
setup-scripts-554c63664f0545ddffbfded2daf7c7505933eb6b.tar.xz
setup-scripts-554c63664f0545ddffbfded2daf7c7505933eb6b.zip
[SSPS] Move slx-admin db init to install stage, add predefined data
We now ship with some predefined table contents, which requires us to set up the db scheme during installation. Probably a smart idea anyways since any errors during that step would then happen right away and not at the customer's site.
Diffstat (limited to 'satellit_installer/satellit_installer')
-rwxr-xr-xsatellit_installer/satellit_installer9
1 files changed, 5 insertions, 4 deletions
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index b252d6b..5704678 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -115,8 +115,6 @@ check_users # Meet interesting users with uid>=1000 and kill them.
# user 65534/sync will be ignored.
add_users_groups # Adding necessary users and groups
-import_gpg
-
sudo_config # Adding sudo config for user taskmanager
install_ipxe "$IPXEDIR"
@@ -185,8 +183,8 @@ install_slxlog
install_timesync # cheap HTTP based timesync on boot
install_finalize # Script for cleaning some stuff after installation
-# Remove translation from menu etc.
-patch_slxadmin
+# Remove translation from menu etc., enable required modules
+patch_slxadmin_dir
# Check dir and file permissions:
set_directory_permissions
@@ -194,6 +192,9 @@ set_directory_permissions
# And set some symbolic links thereafter:
set_links
+# Create tables, fill with predefined stuff
+install_slxadmin_db
+
tar -z -c -T /dev/null -f /opt/openslx/empty.tgz
# Mark vmstore as not mounted