simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

new-root

Browse source
This commit is contained in:
simono41 2018-02-27 22:53:24 +01:00
parent 85c27d7aa8
commit 1cb63c388d
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
arch-graphical-install-auto
View file

@ -27,7 +27,7 @@ userpass="$3"
[[ -z "${userpass}" ]] && userpass="user1" [[ -z "${userpass}" ]] && userpass="user1"
function gitclone() { function gitclone() {
cd /root/ cd /opt/
if [ -d "${repo}" ]; then if [ -d "${repo}" ]; then
echo "${repo} existiert bereits!!!" echo "${repo} existiert bereits!!!"
rm -Rv ${repo} rm -Rv ${repo}
@ -235,17 +235,17 @@ mkdir -p /etc/modprobe.d/
echo "blacklist floppy" > /etc/modprobe.d/blacklist-floppy.conf echo "blacklist floppy" > /etc/modprobe.d/blacklist-floppy.conf
# startup # startup
cp /root/${repo}/startup /usr/bin/ cp /opt/${repo}/startup /usr/bin/
chmod 755 /usr/bin/startup chmod 755 /usr/bin/startup
cp /root/${repo}/startup.service /etc/systemd/system/ cp /opt/${repo}/startup.service /etc/systemd/system/
chmod 644 /etc/systemd/system/startup.service chmod 644 /etc/systemd/system/startup.service
systemctl enable startup.service systemctl enable startup.service
# pacman-config # pacman-config
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
cp /root/${repo}/pacman.conf_libre /etc/pacman.conf cp /opt/${repo}/pacman.conf_libre /etc/pacman.conf
else else
cp /root/${repo}/pacman.conf /etc/pacman.conf cp /opt/${repo}/pacman.conf /etc/pacman.conf
fi fi
# new-config # new-config
@ -258,8 +258,8 @@ if [ -d /root/.config ]; then
fi fi
# mirrorlist # mirrorlist
cp /root/${repo}/mirrorlist_libre /etc/pacman.d/mirrorlist_libre cp /opt/${repo}/mirrorlist_libre /etc/pacman.d/mirrorlist_libre
cp /root/${repo}/mirrorlist /etc/pacman.d/mirrorlist cp /opt/${repo}/mirrorlist /etc/pacman.d/mirrorlist
if [ -f /var/lib/pacman/db.lck ];then if [ -f /var/lib/pacman/db.lck ];then
rm /var/lib/pacman/db.lck rm /var/lib/pacman/db.lck
@ -327,7 +327,7 @@ echo "Beginne mit dem Konfigurieren des Systems :D"
# set desktop # set desktop
echo "set desktop" echo "set desktop"
# #
cp /root/${repo}/xinitrc_${version}.txt /etc/X11/xinit/xinitrc cp /opt/${repo}/xinitrc_${version}.txt /etc/X11/xinit/xinitrc
# #
echo "Systemsprache und dienste werden erstellt!" echo "Systemsprache und dienste werden erstellt!"
@ -501,11 +501,11 @@ if [ "${vollinstallation}" != "n" ]; then
fi fi
# uefi-boot # uefi-boot
cp /root/${repo1}/uefi-boot.sh /usr/bin/uefi-boot cp /opt/${repo1}/uefi-boot.sh /usr/bin/uefi-boot
chmod 755 /usr/bin/uefi-boot chmod 755 /usr/bin/uefi-boot
# write-partitions manager # write-partitions manager
cp /root/${repo}/write_cowspace /usr/bin/write_cowspace cp /opt/${repo}/write_cowspace /usr/bin/write_cowspace
chmod 755 /usr/bin/write_cowspace chmod 755 /usr/bin/write_cowspace
# installer-/usr/bin/ # installer-/usr/bin/
@ -518,44 +518,44 @@ if [ "${vollinstallation}" != "n" ]; then
# installer # installer
mkdir -p /usr/share/applications/ mkdir -p /usr/share/applications/
cp /root/${repo}/arch-install.desktop /usr/share/applications/ cp /opt/${repo}/arch-install.desktop /usr/share/applications/
chmod 755 /usr/share/applications/arch-install.desktop chmod 755 /usr/share/applications/arch-install.desktop
# install-picture # install-picture
mkdir -p /usr/share/pixmaps/ mkdir -p /usr/share/pixmaps/
cp /root/${repo}/install.png /usr/share/pixmaps/ cp /opt/${repo}/install.png /usr/share/pixmaps/
# background # background
mkdir -p /usr/share/backgrounds/xfce/ mkdir -p /usr/share/backgrounds/xfce/
cp /root/${repo}/*.jpg /usr/share/backgrounds/xfce/ cp /opt/${repo}/*.jpg /usr/share/backgrounds/xfce/
chmod 755 -Rv /usr/share/backgrounds/xfce/ chmod 755 -Rv /usr/share/backgrounds/xfce/
# bash.bashrc # bash.bashrc
sed "s|%OS_NAME%|${repo}|g;" /root/${repo}/bash.bashrc > /etc/bash.bashrc sed "s|%OS_NAME%|${repo}|g;" /opt/${repo}/bash.bashrc > /etc/bash.bashrc
cp /root/${repo}/.bashrc /root/ cp /opt/${repo}/.bashrc /root/
# btrfs-swapfile # btrfs-swapfile
cp /root/${repo}/btrfs-swapon.service /etc/systemd/system/ cp /opt/${repo}/btrfs-swapon.service /etc/systemd/system/
cp /root/${repo}/btrfs-swapon /usr/bin/ cp /opt/${repo}/btrfs-swapon /usr/bin/
chmod 755 /usr/bin/btrfs-swapon chmod 755 /usr/bin/btrfs-swapon
cp /root/${repo}/btrfs-swapoff /usr/bin/ cp /opt/${repo}/btrfs-swapoff /usr/bin/
chmod 755 /usr/bin/btrfs-swapoff chmod 755 /usr/bin/btrfs-swapoff
# compress-script # compress-script
cp /root/${repo}/compress.sh /usr/bin/compress cp /opt/${repo}/compress.sh /usr/bin/compress
chmod 755 /usr/bin/compress chmod 755 /usr/bin/compress
# ssh # ssh
cp /root/${repo}/sshd_config /etc/ssh/sshd_config cp /opt/${repo}/sshd_config /etc/ssh/sshd_config
# .Xmodmap # .Xmodmap
cp /root/${repo}/.Xmodmap /root/ cp /opt/${repo}/.Xmodmap /root/
# packages # packages
cp /root/${repo}/packages* /etc/ cp /opt/${repo}/packages* /etc/
# snapshot.sh # snapshot.sh
cp /root/${repo}/snapshot.sh /usr/bin/snapshot cp /opt/${repo}/snapshot.sh /usr/bin/snapshot
chmod 755 /usr/bin/snapshot chmod 755 /usr/bin/snapshot
# ip_forward # ip_forward
@ -563,26 +563,26 @@ if [ "${vollinstallation}" != "n" ]; then
echo 1 > /proc/sys/net/ipv4/ip_forward echo 1 > /proc/sys/net/ipv4/ip_forward
# .Conky # .Conky
tar -vxJf /root/${repo}/.Conky.tar.xz -C /opt/ tar -vxJf /opt/${repo}/.Conky.tar.xz -C /opt/
chmod 755 -Rv /opt/.Conky/ chmod 755 -Rv /opt/.Conky/
touch /root/notes.txt touch /root/notes.txt
# .config # .config
tar -vxJf /root/${repo}/.config.tar.xz -C /root/ tar -vxJf /opt/${repo}/.config.tar.xz -C /root/
gnomeconfig gnomeconfig
# .xscreensaver # .xscreensaver
cp /root/${repo}/.xscreensaver /root/ cp /opt/${repo}/.xscreensaver /root/
# hosts # hosts
cp /root/${repo}/hosts /etc/ cp /opt/${repo}/hosts /etc/
# santana # santana
mkdir -p /usr/share/fonts/TTF/ mkdir -p /usr/share/fonts/TTF/
tar -vxJf /root/${repo}/santana.tar.xz -C /usr/share/fonts/TTF/ tar -vxJf /opt/${repo}/santana.tar.xz -C /usr/share/fonts/TTF/
# update-script # update-script
cp /root/${repo}/update.sh /usr/bin/update-script cp /opt/${repo}/update.sh /usr/bin/update-script
chmod 755 /usr/bin/update-script chmod 755 /usr/bin/update-script
# Verzeichnise # Verzeichnise
@ -593,7 +593,7 @@ if [ "${vollinstallation}" != "n" ]; then
mkdir -p /root/Videos mkdir -p /root/Videos
# adduser.sh # adduser.sh
cp /root/${repo}/adduser.sh /usr/bin/adduser cp /opt/${repo}/adduser.sh /usr/bin/adduser
chmod 755 /usr/bin/adduser chmod 755 /usr/bin/adduser
fi fi

22
arch-install
View file

@ -2,7 +2,7 @@
# #
set -ex set -ex
echo "Version : Fr 22. Dez 00:00:41 CET 2017" echo "Version : DI 27. Feb 22:52:41 CET 2017"
WEBADDRESS="https://github.com/simono41/SpectreOS.git" WEBADDRESS="https://github.com/simono41/SpectreOS.git"
repo="SpectreOS" repo="SpectreOS"
@ -30,12 +30,12 @@ function minimalinstallation() {
while read line while read line
do do
pacstrap -c -d -G -M ${mountpoint} $line pacstrap -c -d -G -M ${mountpoint} $line
done < /root/${repo}/base.txt done < /opt/${repo}/base.txt
} }
function gitclone() { function gitclone() {
cd /root/ cd /opt/
if [ -d "${repo}" ]; then if [ -d "${repo}" ]; then
echo "${repo} existiert bereits!!!" echo "${repo} existiert bereits!!!"
rm -Rv ${repo} rm -Rv ${repo}
@ -117,8 +117,8 @@ function usbkeyinstallation() {
function usbsecret() { function usbsecret() {
cp /root/${repo}/install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret cp /opt/${repo}/install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret
cp /root/${repo}/hooks/usbsecret ${mountpoint}/root/usbsecret cp /opt/${repo}/hooks/usbsecret ${mountpoint}/root/usbsecret
# hooks # hooks
#cp install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret #cp install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret
@ -133,7 +133,7 @@ function cron() {
mkdir -p ${mountpoint}/var/spool/cron/ mkdir -p ${mountpoint}/var/spool/cron/
echo "0 18 * * * /usr/bin/snapshot make ROOT home opt var/cache/pacman/pkg ${mountsnaps}" > ${mountpoint}/var/spool/cron/root echo "0 18 * * * /usr/bin/snapshot make ROOT home opt var/cache/pacman/pkg ${mountsnaps}" > ${mountpoint}/var/spool/cron/root
if [ "${update}" != "n" ]; then if [ "${update}" != "n" ]; then
cp /root/${repo}/snapshot.sh ${mountpoint}/usr/bin/snapshot cp /opt/${repo}/snapshot.sh ${mountpoint}/usr/bin/snapshot
chmod 755 ${mountpoint}/usr/bin/snapshot chmod 755 ${mountpoint}/usr/bin/snapshot
fi fi
} }
@ -148,9 +148,9 @@ function makeswapfile() {
function makebtrfsswapfile() { function makebtrfsswapfile() {
/root/${repo}/btrfs-swapon ${mountpoint}/usr/bin/btrfs-swapon /opt/${repo}/btrfs-swapon ${mountpoint}/usr/bin/btrfs-swapon
/root/${repo}/btrfs-swapoff ${mountpoint}/usr/bin/btrfs-swapoff /opt/${repo}/btrfs-swapoff ${mountpoint}/usr/bin/btrfs-swapoff
/root/${repo}/btrfs-swapon.service ${mountpoint}/root/btrfs-swapon.service /opt/${repo}/btrfs-swapon.service ${mountpoint}/root/btrfs-swapon.service
chmod +x ${mountpoint}/usr/bin/btrfs-swapon chmod +x ${mountpoint}/usr/bin/btrfs-swapon
chmod +x ${mountpoint}/usr/bin/btrfs-swapoff chmod +x ${mountpoint}/usr/bin/btrfs-swapoff
@ -895,7 +895,7 @@ then
else else
echo "Git is not installet" echo "Git is not installet"
fi fi
/root/${repo}/arch-install n ${version} /opt/${repo}/arch-install n ${version}
exit 0 exit 0
fi fi
fi fi
@ -986,7 +986,7 @@ if [ "${update}" != "n" ] && [ "${offline}" == "n" ]; then
read -p "Soll die erweiterte Installation durchgeführt werden? [Y/n] " graphical read -p "Soll die erweiterte Installation durchgeführt werden? [Y/n] " graphical
if [ "$graphical" != "n" ] if [ "$graphical" != "n" ]
then then
cp /root/${repo}/arch-graphical-install-auto ${mountpoint}/root/arch-graphical-install-auto cp /opt/${repo}/arch-graphical-install-auto ${mountpoint}/root/arch-graphical-install-auto
if [ "${version}" == "-libre" ]; then if [ "${version}" == "-libre" ]; then
arch-chroot ${mountpoint} /root/arch-graphical-install-auto libre arch-chroot ${mountpoint} /root/arch-graphical-install-auto libre
else else