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

new-features

Browse source
This commit is contained in:
simono41 2018-04-25 08:09:12 +02:00
parent 702cb7307a
commit cd109a08ef
2 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch-install
View file

@ -259,11 +259,11 @@ function installation {
echo "It is a copytoram system." echo "It is a copytoram system."
unsquashfs -f -d ${mountpoint} /run/archiso/copytoram/airootfs.sfs unsquashfs -f -d ${mountpoint} /run/archiso/copytoram/airootfs.sfs
else else
read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationfehler read -p "Where is the airootfs.sfs? Please specify the complete path or choose the online installation? [/airootfs.sfs/online] : " installationsfehler
if [ "${installationfehler}" == "online" ]; then if [ "${installationsfehler}" == "online" ]; then
minimalinstallation minimalinstallation
else else
unsquashfs -f -d ${mountpoint} ${installationfehler} unsquashfs -f -d ${mountpoint} ${installationsfehler}
fi fi
fi fi
else else
@ -1106,14 +1106,14 @@ fi
# benutzerwechsel # benutzerwechsel
if [ "${name}" != "noinstall" ]; then if [ "${name}" != "noinstall" ] && [ -z "${installationsfehler}" ]; then
#arch-chroot ${mountpoint} usermod -l "${name}" user1 #arch-chroot ${mountpoint} usermod -l "${name}" user1
#arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}" #arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}"
arch-chroot ${mountpoint} chfn -f "${name}" user1 arch-chroot ${mountpoint} chfn -f "${name}" user1
arch-chroot ${mountpoint} passwd user1 arch-chroot ${mountpoint} passwd user1
fi fi
if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ "${installationfehler}" == "online" ]; then if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ -n "${installationsfehler}" ]; then
read -p "Should the extended installation be carried out? [Y/n] " graphical read -p "Should the extended installation be carried out? [Y/n] " graphical
if [ "$graphical" != "n" ] if [ "$graphical" != "n" ]
then then

17
make_mksquashfs-auto.sh
View file

@ -22,7 +22,7 @@ echo "Hallo Echo"
# for-schleife # for-schleife
for wort in "$2" "$3" "$4" "$5" "$6" "$7" for wort in "$2" "$3" "$4" "$5" "$6" "$7"
do do
echo "$wort" echo "$wort"
if [ "$wort" == "deletework" ]; then deletework=y; fi if [ "$wort" == "deletework" ]; then deletework=y; fi
if [ "$wort" == "filesystem" ]; then filesystem=y; fi if [ "$wort" == "filesystem" ]; then filesystem=y; fi
@ -30,6 +30,7 @@ for wort in "$2" "$3" "$4" "$5" "$6" "$7"
if [ "$wort" == "makebios" ]; then makebios=y; fi if [ "$wort" == "makebios" ]; then makebios=y; fi
if [ "$wort" == "makeimage" ]; then makeimage=y; fi if [ "$wort" == "makeimage" ]; then makeimage=y; fi
if [ "$wort" == "makeiso" ]; then makeiso=y; fi if [ "$wort" == "makeiso" ]; then makeiso=y; fi
if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi
done done
sleep 5 sleep 5
@ -112,6 +113,7 @@ function filesystem() {
fi fi
if [ "${mkinitcpio}" == "y" ]; then
# module and hooks # module and hooks
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
@ -142,6 +144,7 @@ function filesystem() {
cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/ cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
fi fi
fi
@ -439,19 +442,19 @@ if [ "${makeimage}" == "y" ]; then
fi fi
if [ "${makebios}" == "y" ]; then if [ "${makebios}" == "y" ]; then
# BIOS # BIOS
BIOS BIOS
# EFI # EFI
UEFI UEFI
fi fi
if [ "${makeiso}" == "y" ]; then if [ "${makeiso}" == "y" ]; then
# MAKEISO # MAKEISO
makeiso makeiso
fi fi
# chroot # chroot