fix
This commit is contained in:
parent
34aaa9f3dc
commit
2d4aefa88e
1 changed files with 28 additions and 15 deletions
27
arch-install
27
arch-install
|
@ -206,27 +206,36 @@ function installation {
|
||||||
#root
|
#root
|
||||||
if [ "${dateisystem}" == "btrfs" ]; then
|
if [ "${dateisystem}" == "btrfs" ]; then
|
||||||
#mkfs.btrfs -f -L p_arch ${device}2
|
#mkfs.btrfs -f -L p_arch ${device}2
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
btrfsformat #btrfs
|
btrfsformat #btrfs
|
||||||
|
fi
|
||||||
subvolume #btrfs
|
subvolume #btrfs
|
||||||
|
|
||||||
elif [ "${dateisystem}" == "ext4" ]; then
|
elif [ "${dateisystem}" == "ext4" ]; then
|
||||||
echo "confirm with j"
|
echo "confirm with j"
|
||||||
if [ "${verschluesselung}" == "y" ]; then
|
if [ "${verschluesselung}" == "y" ]; then
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
mkfs.ext4 -L p_arch ${deviceluks} #ext4
|
mkfs.ext4 -L p_arch ${deviceluks} #ext4
|
||||||
|
fi
|
||||||
mount ${deviceluks} ${mountpoint}
|
mount ${deviceluks} ${mountpoint}
|
||||||
else
|
else
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
mkfs.ext4 -L p_arch ${device}${rootpartitionnummer} #ext4
|
mkfs.ext4 -L p_arch ${device}${rootpartitionnummer} #ext4
|
||||||
|
fi
|
||||||
mount ${device}${rootpartitionnummer} ${mountpoint}
|
mount ${device}${rootpartitionnummer} ${mountpoint}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#swap
|
#swap
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
if [ "${swap}" != "n" ]; then
|
if [ "${swap}" != "n" ]; then
|
||||||
mkswap -L p_swap ${device}${swappartitionnummer}
|
mkswap -L p_swap ${device}${swappartitionnummer}
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
#installation
|
#installation
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
if [ "${offline}" != "n" ]
|
if [ "${offline}" != "n" ]
|
||||||
then
|
then
|
||||||
if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then
|
if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then
|
||||||
|
@ -246,6 +255,7 @@ function installation {
|
||||||
else
|
else
|
||||||
minimalinstallation
|
minimalinstallation
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# module and hooks
|
# module and hooks
|
||||||
parameter="base udev "
|
parameter="base udev "
|
||||||
|
@ -284,7 +294,7 @@ function installation {
|
||||||
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
|
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
|
||||||
echo ""
|
echo ""
|
||||||
echo "blacklist floppy" > ${mountpoint}/etc/modprobe.d/blacklist-floppy.conf
|
echo "blacklist floppy" > ${mountpoint}/etc/modprobe.d/blacklist-floppy.conf
|
||||||
echo "tmpfs /tmp tmpfs defaults 0 0" >> ${mountpoint}/etc/fstab
|
echo "tmpfs /tmp tmpfs defaults 0 0" > ${mountpoint}/etc/fstab
|
||||||
echo "tmpfs /dev/shm tmpfs defaults 0 0" >> ${mountpoint}/etc/fstab
|
echo "tmpfs /dev/shm tmpfs defaults 0 0" >> ${mountpoint}/etc/fstab
|
||||||
|
|
||||||
#fstab
|
#fstab
|
||||||
|
@ -324,7 +334,7 @@ function installation {
|
||||||
if [ "${swap}" != "n" ]; then
|
if [ "${swap}" != "n" ]; then
|
||||||
if [ "${verschluesselung}" == "y" ]; then
|
if [ "${verschluesselung}" == "y" ]; then
|
||||||
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
|
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
|
||||||
echo "swap PARTUUID=${swappartition} /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256" >> ${mountpoint}/etc/crypttab
|
echo "swap PARTUUID=${swappartition} /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256" > ${mountpoint}/etc/crypttab
|
||||||
echo "/dev/mapper/swap none swap defaults 0 0" >> ${mountpoint}/etc/fstab
|
echo "/dev/mapper/swap none swap defaults 0 0" >> ${mountpoint}/etc/fstab
|
||||||
else
|
else
|
||||||
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
|
swappartition=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
|
||||||
|
@ -333,6 +343,7 @@ function installation {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#makeswapfile+fstab
|
#makeswapfile+fstab
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
if [ "${swapfile}" == "y" ]; then
|
if [ "${swapfile}" == "y" ]; then
|
||||||
if [ "${dateisystem}" == "btrfs" ]; then
|
if [ "${dateisystem}" == "btrfs" ]; then
|
||||||
makebtrfsswapfile
|
makebtrfsswapfile
|
||||||
|
@ -340,18 +351,22 @@ function installation {
|
||||||
makeswapfile
|
makeswapfile
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
#hostname
|
#hostname
|
||||||
echo "${repo}-${version}" > ${mountpoint}/etc/hostname
|
echo "${repo}-${version}" > ${mountpoint}/etc/hostname
|
||||||
|
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
if [ "${usbsecret}" == "y" ]; then
|
if [ "${usbsecret}" == "y" ]; then
|
||||||
usbsecret
|
usbsecret
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
if [ "${usbkey}" == "y" ]; then
|
if [ "${usbkey}" == "y" ]; then
|
||||||
usbkeyinstallation
|
usbkeyinstallation
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -539,6 +554,7 @@ function subvolume() {
|
||||||
btrfsmount 1
|
btrfsmount 1
|
||||||
|
|
||||||
# Create
|
# Create
|
||||||
|
if [ "${name}" != "noinstall" ]; then
|
||||||
mkdir -p /mnt/btrfs-root/__snapshot
|
mkdir -p /mnt/btrfs-root/__snapshot
|
||||||
mkdir -p /mnt/btrfs-root/__current
|
mkdir -p /mnt/btrfs-root/__current
|
||||||
btrfs subvolume create /mnt/btrfs-root/__current/ROOT
|
btrfs subvolume create /mnt/btrfs-root/__current/ROOT
|
||||||
|
@ -553,6 +569,7 @@ function subvolume() {
|
||||||
mkdir -p /mnt/btrfs-root/__current${wort%/*}
|
mkdir -p /mnt/btrfs-root/__current${wort%/*}
|
||||||
btrfs subvolume create /mnt/btrfs-root/__current${wort}
|
btrfs subvolume create /mnt/btrfs-root/__current${wort}
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
btrfs subvolume list -p /mnt/btrfs-root
|
btrfs subvolume list -p /mnt/btrfs-root
|
||||||
|
|
||||||
|
@ -978,10 +995,8 @@ then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${name}" != "noinstall" ]; then
|
|
||||||
echo "installation"
|
echo "installation"
|
||||||
installation
|
installation
|
||||||
fi
|
|
||||||
grubinstall
|
grubinstall
|
||||||
|
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
|
@ -1010,10 +1025,8 @@ elif [ "${Partition}" == "bios" ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${name}" != "noinstall" ]; then
|
|
||||||
echo "installation"
|
echo "installation"
|
||||||
installation
|
installation
|
||||||
fi
|
|
||||||
grubinstall
|
grubinstall
|
||||||
|
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
|
|
Loading…
Reference in a new issue