diff --git a/README.md b/README.md index 030ae08..1047f85 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ With a 3.40GHz dual core i3 CPU with hyperthreading enabled and 16GB of RAM, the ## Tasks ## Contributing -Please fork this repository and submit pull requests against the devel branch. Pull requests will be reviewed as time permits. +Please see [CONTRIBUTING.md](CONTRIBUTING.md) ## Resources * [RITlug website](http://ritlug.com) diff --git a/tigeros.ks b/tigeros.ks index 34d985b..99743e7 100644 --- a/tigeros.ks +++ b/tigeros.ks @@ -295,7 +295,7 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \ # Drop the rescue kernel and initramfs, we don't need them on the live media itself. # See bug 1317709 -rm -f /boot/\*-rescue* +rm -f /boot/*-rescue* # Disable network service here, as doing it in the services line # fails due to RHBZ #1369794 @@ -308,7 +308,7 @@ touch /etc/machine-id %end %post --nochroot -cp $INSTALL_ROOT/usr/share/licenses/\*-release/\* $LIVE_ROOT/ +cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/ # only works on x86, x86_64 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then @@ -319,7 +319,6 @@ fi %end %post -# THIS IS ALL RUN IN THE LIVE ROOT # cinnamon configuration # create /etc/sysconfig/desktop (needed for installation) @@ -352,28 +351,30 @@ chown -R liveuser:liveuser /home/liveuser restorecon -R /home/liveuser EOF -%end -%post --nochroot + # go to the backgrounds folder for custom images cd /usr/share/backgrounds/images # fetch custom RIT backgrounds #FIXME -# Fetch rpm fusion scripts -mkdir -p $INSTALL_ROOT/usr/share/autostart -mkdir -p $INSTALLROOT/usr/local/tigeros -cp -r /scripts/ $INSTALL_ROOT/usr/local/tigeros/ +# Fetch scripts +mkdir -p /usr/share/autostart +mkdir -p /usr/local/tigeros/ +cd /usr/local/tigeros/ +#wget people.rit.edu/axk4545/scripts.tar.gz +wget --no-check-certificate http://129.21.1.44/axk4545/scripts.tar.gz +tar -xvf /usr/local/tigeros/scripts.tar.gz -C /usr/local/tigeros/ +ln -s /usr/local/enablerpmfusion.sh /usr/share/autostart/enablerpmfusion.sh +ln -s /usr/local/tigeros/FusionEnableLauncher.py /usr/share/autostart/FusionEnableLauncher.py +ln -s /usr/local/tigeros/postinstall /usr/share/autostart/postinstall -ln -s $INSTALL_ROOT/home/liveuser/enablerpmfusion.sh $INSTALL_ROOT/usr/share/autostart/enablerpmfusion.sh -ln -s $INSTALL_ROOT/usr/local/tigeros/FusionEnableLauncher.py $INSTALL_ROOT/usr/share/autostart/FusionEnableLauncher.py -ln -s $INSTALL_ROOT/usr/local/tigeros/postinstall $INSTALL_ROOT/usr/share/autostart/postinstall - -chmod -R 755 $INSTALL_ROOT/usr/local/tigeros/ +chmod -R 755 /usr/local/tigeros/ # Download and install google chrome -dnf --installroot=$INSTALL_ROOT install https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm -restorecon -R $INSTALL_ROOT/home/liveuser +dnf install https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + +restorecon -R /usr/local/tigeros %end %packages