TileOS/iso-builder
TileOS/iso-builder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct RPi build

Browse source
This commit is contained in:
Aleksey Samoilov 2023-02-12 15:13:01 +04:00
parent 037dc52c5d
commit ba1ac97f57
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build-rpi.sh
View file

@ -120,7 +120,10 @@ chmod +x ubuntusway-$architecture/hardware
LANG=C.UTF-8 chroot ubuntusway-$architecture /hardware LANG=C.UTF-8 chroot ubuntusway-$architecture /hardware
# Copy in any file overrides # Copy in any file overrides
cp -rv "${rootdir}"/etc/config/includes.chroot/* ubuntusway-$architecture/ cp -rv "${rootdir}"/etc/config/includes.chroot/etc/apt/ ubuntusway-$architecture/etc/
cp -rv "${rootdir}"/etc/config/includes.chroot/etc/netplan/ ubuntusway-$architecture/etc/
cp -rv "${rootdir}"/etc/config/includes.chroot/usr ubuntusway-$architecture/
cp -rv "${rootdir}"/rpi/greetd/* ubuntusway-${architecture}/etc/greetd/
mkdir ubuntusway-$architecture/hooks mkdir ubuntusway-$architecture/hooks
cp -v "${rootdir}"/etc/config/hooks/live/*.chroot ubuntusway-$architecture/hooks cp -v "${rootdir}"/etc/config/hooks/live/*.chroot ubuntusway-$architecture/hooks
@ -134,12 +137,16 @@ done
rm -r "ubuntusway-$architecture/hooks" rm -r "ubuntusway-$architecture/hooks"
# Create default user (WARNING! This is a temporary solution, until postinstall user setup is created) # Create OEM user
cat <<EOF >> ubuntusway-$architecture/user cat <<EOF >> ubuntusway-$architecture/user
#!/bin/bash #!/bin/bash
adduser --disabled-password --gecos "" ubuntu apt-get update
echo "ubuntu:ubuntusway" | chpasswd apt-get -y install calamares-arm-oem
usermod -a -G adm,dialout,cdrom,sudo,audio,video,plugdev,games,users,input,netdev ubuntu DATE=$(date +%m%H%M%S)
PASSWD=$(mkpasswd -m sha-512 oem "${DATE}")
addgroup --gid 29999 oem
adduser --gecos "OEM Configuration (temporary user)" --add_extra_groups --disabled-password --gid 29999 --uid 29999 oem
usermod -a -G adm,sudo -p "${PASSWD}" oem
rm -f user rm -f user
EOF EOF
@ -163,13 +170,11 @@ Requires=local-fs.target
After=local-fs.target After=local-fs.target
Before=swapfile.swap Before=swapfile.swap
ConditionPathExists=!/swapfile ConditionPathExists=!/swapfile
[Service] [Service]
Type=oneshot Type=oneshot
ExecStartPre=fallocate -l 1GiB /swapfile ExecStartPre=fallocate -l 1GiB /swapfile
ExecStartPre=chmod 600 /swapfile ExecStartPre=chmod 600 /swapfile
ExecStart=mkswap /swapfile ExecStart=mkswap /swapfile
[Install] [Install]
WantedBy=swap.target WantedBy=swap.target
EOF EOF
@ -177,7 +182,6 @@ EOF
cat <<EOF >> ubuntusway-$architecture/usr/lib/systemd/system/swapfile.swap cat <<EOF >> ubuntusway-$architecture/usr/lib/systemd/system/swapfile.swap
[Unit] [Unit]
Description=The default swapfile Description=The default swapfile
[Swap] [Swap]
What=/swapfile What=/swapfile
EOF EOF

2
rpi/greetd/config.toml
View file

@ -3,7 +3,7 @@ vt = "next"
[default_session] [default_session]
command = "tuigreet --remember --time --issue --asterisks --cmd sway" command = "tuigreet --remember --time --issue --asterisks --cmd sway"
user = "greeter" user = "_greetd"
[initial_session] [initial_session]
command = "sway --config /etc/greetd/oem-setup" command = "sway --config /etc/greetd/oem-setup"