uml config fix

Author: sleirsgoevy

.github/workflows/rust.yml

@@ -88,7 +88,7 @@ jobs:
         if: always()
         run: |
           mkdir /tmp/logs
-          cp ./strace* uml-ci/slirp* /tmp/logs || true
+          cp ./strace* /tmp/logs
       - uses: actions/upload-artifact@v1
         if: always()
         with:

ci/linux.sh

@@ -13,7 +13,7 @@ if [[ $CI_CGROUPS == "cgroup-v2" ]] && [ -z "${CI_VM+set}" ]; then
   sudo apt install sshpass strace
   wget http://ftp.debian.org/debian/pool/main/s/slirp/slirp_1.0.17-8_amd64.deb -O slirp.deb && sudo dpkg -i slirp.deb
   ( cd uml-ci; ./main.sh; )
-  sudo sshpass -p user ssh -p 2224 user@127.0.0.1 "cat /vagrant/logs.zip | base64" | base64 --decode > logs.zip
+  #sudo sshpass -p user ssh -p 2224 user@127.0.0.1 "cat logs.zip | base64" | base64 --decode > logs.zip ## WTF IS THIS??
   sudo sshpass -p user ssh -p 2224 user@127.0.0.1 sudo poweroff
   rm stracez-dummy
   unzip logs.zip

uml-ci/main.sh

@@ -10,8 +10,14 @@ tar -xJf linux-5.4.93.tar.xz
 cd linux-5.4.93
 export ARCH=um
 make defconfig
+cat >> .config << EOF
+CONFIG_CGROUP_PIDS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+EOF
 make -j3
 )
 linux-5.4.93/linux mem=4096M ubda=img rootfstype=hostfs init="$PWD"/uml-setup.sh
-linux-5.4.93/linux mem=4096M ubda=img root=/dev/ubda1 rootfstype=ext4 hostfs=.. eth0=slirp,,./uml-slirp.sh &
+linux-5.4.93/linux mem=4096M ubda=img root=/dev/ubda1 rootfstype=ext4 hostfs=.. eth0=slirp,,./uml-slirp.sh
 ./uml-ssh.sh

uml-ci/payload.sh

@@ -5,4 +5,4 @@ export CI_OS=fedora
 export CI_CGROUPS=cgroup-v2
 export CI_TARGET=x86_64-unknown-linux-musl
 export CI_VM=1
-bash ci/linux.sh
+exec ci/linux.sh

uml-ci/uml-setup.sh

@@ -14,8 +14,6 @@ echo root:root | chpasswd
 ifconfig eth0 10.0.2.15 netmask 255.255.255.0
 route add default dev eth0
 echo nameserver 10.0.2.3 > /etc/resolv.conf
-ifconfig -a > /dev/console
-route > /dev/console
 exit 0
 ' > /dev/mnt/etc/rc.d/rc.local
 chmod +x /dev/mnt/etc/rc.d/rc.local

uml-ci/uml-ssh.sh

@@ -6,5 +6,5 @@ while ! echo incompatible | nc 127.0.0.1 2224; do sleep 1; done
 set -e
 
 sleep 10
-sshpass -p root ssh -v -o 'StrictHostKeyChecking no' -p 2224 root@127.0.0.1 'sed -i '"'"'s/.*wheel.*/#\0/'"'"' /etc/sudoers; sed -i '"'"'s/#*\(.*wheel.*NOPASSWD.*\)/\1/'"'"' /etc/sudoers; adduser -g wheel --uid '"$(id -u)"' user; echo user:user | chpasswd'
-sshpass -p user ssh -v -o 'StrictHostKeyChecking no' -p 2224 user@127.0.0.1 'sudo mount -t hostfs hostfs ~; cd; exec uml-ci/payload.sh'
+sshpass -p root ssh -o 'StrictHostKeyChecking no' -p 2224 root@127.0.0.1 'sed -i '"'"'s/.*wheel.*/#\0/'"'"' /etc/sudoers; sed -i '"'"'s/#*\(.*wheel.*NOPASSWD.*\)/\1/'"'"' /etc/sudoers; adduser -g wheel --uid '"$(id -u)"' user; echo user:user | chpasswd'
+sshpass -p user ssh -o 'StrictHostKeyChecking no' -p 2224 user@127.0.0.1 'sudo mount -t hostfs hostfs ~; cd; exec uml-ci/payload.sh'