Compare commits
3 Commits
b35a5148a3
...
c9e38bba32
| Author | SHA1 | Date | |
|---|---|---|---|
| c9e38bba32 | |||
| e7b1f3754a | |||
| 84873e1047 |
@@ -21,15 +21,12 @@ fi
|
||||
if [ -f "$SUDO_HOME/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop" ]; then
|
||||
echo "Remove Autostart Nextcloud"
|
||||
rm $SUDO_HOME/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop
|
||||
#Stopping Nextcloud
|
||||
su -c "$BASECMD --quit 1>/dev/null 2>/dev/null" $SUDO_USER
|
||||
sleep 5
|
||||
fi
|
||||
|
||||
NC_PID=$( pgrep -u $USER nextcloud )
|
||||
if [[ ! -z ${NC_PID} ]]; then
|
||||
echo "Stopping Nextcloud with PID ${NC_PID}"
|
||||
# $BASECMD --quit 1>/dev/null 2>/dev/null && sleep 5
|
||||
# $BASECMD --quit 1>/dev/null 2>/dev/null && sleep 2
|
||||
kill ${NC_PID}
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Service could not be stopped, please check why."
|
||||
@@ -111,6 +108,7 @@ done
|
||||
# exit 1
|
||||
#fi
|
||||
# Now start Nextcloud
|
||||
nohup ${BASECMD} 1>/dev/null 2>/dev/null &
|
||||
echo "Starting Nextcloud Client in Background"
|
||||
nohup ${BASECMD} --background 1>/dev/null 2>/dev/null &
|
||||
echo "Done Setup of Nextcloud."
|
||||
exit 0
|
||||
|
||||
@@ -7,4 +7,6 @@ fi
|
||||
|
||||
# Start Nextcloud Talk in Background
|
||||
#Current Version of Talk is dumping Core
|
||||
echo "Starting Nextcloud Talk in Background."
|
||||
/usr/bin/nohup /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=electron-wrapper --file-forwarding com.nextcloud.talk 1>${TEMPDIR}/talk.log 2>&1 &
|
||||
#/usr/bin/nohup /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=electron-wrapper --file-forwarding com.nextcloud.talk --background 1>/dev/null 2>&1 &
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
%include ks_pc_prof/pc-9cdb93ef7c20.cfg
|
||||
%include /ks_base_profiles/kde_fullsetup.cfg
|
||||
%include /ks_base_profiles/part_sda.cfg
|
||||
|
||||
@@ -34,22 +34,6 @@ authselect enable-feature with-fingerprint
|
||||
# Run the Setup Agent on first boot
|
||||
firstboot --enable
|
||||
|
||||
# Generated using Blivet version 3.12.1
|
||||
ignoredisk --only-use=nvme0n1
|
||||
# Partition clearing information
|
||||
clearpart --none --initlabel
|
||||
# Disk partitioning information
|
||||
part /boot/efi --fstype="efi" --ondisk=nvme0n1 --size=600 --fsoptions="umask=0077,shortname=winnt"
|
||||
#part /sys_config --fstype="ext4" --noformat --onpart=UUID=3f9837da-5a46-4da1-a98b-62a8899e63cb --label=OEMDRV
|
||||
part /sys_config --fstype="ext4" --noformat --label=OEMDRV
|
||||
part /boot --fstype="ext4" --ondisk=nvme0n1 --size=2048
|
||||
#part btrfs.115 --fstype="btrfs" --ondisk=nvme0n1 --size=485249
|
||||
# Make the Install have 100GB at the beginning
|
||||
part btrfs.115 --fstype="btrfs" --ondisk=nvme0n1 --size=100000
|
||||
btrfs none --label=fedora_fedora btrfs.115
|
||||
btrfs / --subvol --name=root LABEL=fedora_fedora
|
||||
btrfs /home --subvol --name=home LABEL=fedora_fedora
|
||||
|
||||
timesource --ntp-server=_gateway
|
||||
# System timezone
|
||||
timezone Europe/Berlin --utc
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# Generated using Blivet version 3.12.1
|
||||
ignoredisk --only-use=sda
|
||||
# Partition clearing information
|
||||
clearpart --none --initlabel
|
||||
# Disk partitioning information
|
||||
part biosboot --fstype="biosboot" --ondisk=sda --size=1
|
||||
part btrfs.69 --fstype="btrfs" --ondisk=sda --size=80000
|
||||
part /boot --fstype="xfs" --ondisk=sda --size=2048
|
||||
btrfs none --label=fedora btrfs.69
|
||||
btrfs / --subvol --name=root LABEL=fedora
|
||||
@@ -112,7 +112,7 @@ fi
|
||||
install_sw()
|
||||
{
|
||||
check_root
|
||||
yum install -y mc htop ipa-client thunderbird pip npm pykickstart gocryptfs mediawriter
|
||||
dnf install -y mc htop ipa-client thunderbird pykickstart gocryptfs mediawriter
|
||||
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
|
||||
#Set default Umask 0077
|
||||
@@ -195,7 +195,7 @@ case $1 in
|
||||
echo "Mode: Install"
|
||||
install_sw
|
||||
prepare_skel
|
||||
# firstrun_prepare
|
||||
firstrun_prepare
|
||||
;;
|
||||
'firstrun_prepare')
|
||||
firstrun_prepare
|
||||
|
||||
Reference in New Issue
Block a user