From 39739e842aaf639a611cbcf387e6f228f746764d Mon Sep 17 00:00:00 2001 From: "Prof. Lee" Date: Tue, 31 Oct 2023 13:02:35 -0400 Subject: [PATCH] Tweaks --- o405-uxx/postinstall.sh | 34 +++++++------- o405-uxx/user-data | 99 +++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 61 deletions(-) diff --git a/o405-uxx/postinstall.sh b/o405-uxx/postinstall.sh index 5c83ce0..b272475 100644 --- a/o405-uxx/postinstall.sh +++ b/o405-uxx/postinstall.sh @@ -4,21 +4,21 @@ echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add - apt update -apt install -y ubuntu-desktop git ros-noetic-desktop-full python3-rosdep nfs-common sssd-ad sssd sssd-tools libnss-sss libpam-sss realmd samba-common-bin adcli sssd-ldap ldap-utils sssd-ldap krb5-user sshfs +apt install -y -qq ubuntu-desktop git ros-noetic-desktop-full python3-rosdep nfs-common sssd-ad sssd sssd-tools libnss-sss libpam-sss realmd samba-common-bin adcli sssd-ldap ldap-utils sssd-ldap krb5-user sshfs +# apt install -y -qq git ros-noetic-desktop-full python3-rosdep nfs-common sssd-ad sssd sssd-tools libnss-sss libpam-sss realmd samba-common-bin adcli sssd-ldap ldap-utils sssd-ldap krb5-user sshfs snap install firefox gnome-3-38-2004 gtk-common-themes snap-store snapd-desktop-integration snap install --classic code - -# Add saabd drive -mkdir /mgc -echo "saabd.eecs.cwru.edu:/mgc /mgc nfs rsize=8192,wsize=8192,timeo=14,intr" >> /etc/fstab +# # Add saabd drive +# mkdir /mgc +# echo "saabd.eecs.cwru.edu:/mgc /mgc nfs rsize=8192,wsize=8192,timeo=14,intr" >> /etc/fstab # Remove user list from login screen sed -i "s/# disable-user-list/disable-user-list/g" /etc/gdm3/greeter.dconf-defaults # Remove the first login stuff -echo "InitialSetupEnable=false" >> /etc/gdm3/custom.conf +sed -i "8i InitialSetupEnable=false" /etc/gdm3/custom.conf # Add logout script # Update the logout script everytime in case it changed @@ -29,17 +29,17 @@ echo "rm -rf /tmp/ariac >/dev/null 2>/dev/null & disown" >> /etc/skel/.bash_logo echo "killall roslaunch roscore gzserver gzclient >/dev/null 2>/dev/null & disown" >> /etc/skel/.bash_logout # This is temporary until individual accounts work -echo "rm -rf ~/.ssh/*" >> /etc/skel/.bash_logout -echo "rm -rf ~/.git" >> /etc/skel/.bash_logout -echo "rm -rf ~/*_ws" >> /etc/skel/.bash_logout +echo "rm -rf ~/.ssh/*" >> /etc/bash.bashrc +echo "rm -rf ~/.git" >> /etc/bash.bashrc +echo "rm -rf ~/*_ws" >> /etc/bash.bashrc # Logout stale users -echo "#!/usr/bin/env sh" > /etc/cron.hourly/logout_stale.sh +echo '#!/usr/bin/env sh' > /etc/cron.hourly/logout_stale.sh echo "kill -9 `who -u | gawk '/old/ {print $6}' - `" >> /etc/cron.hourly/logout_stale.sh -# Update the system -apt-get update -apt-get upgrade -y +# # Update the system +# apt-get update +# apt-get upgrade -y # Add LabHome stuff (seems broken) wget -O /etc/xdg/autostart/mounthomegui.desktop http://raw.githubusercontent.com/cwru-robotics/cwru_robotics_autoinstall_scripts/focal_install/o405-uxx/mounthomegui.desktop @@ -54,8 +54,8 @@ wget -O /etc/cron.hourly/logout_stale.sh http://raw.githubusercontent.com/cwru-r chmod u+x /usr/cron.hourly/logout_stale.sh # Build custom ROS stuff for now -mkdir -p ros_ws/src -cd ros_ws/src +mkdir -p tmp/ros_ws/src +cd tmp/ros_ws/src git clone https://github.com/cwru-eecs-275/stdr_simulator.git git clone https://github.com/cwru-eecs-373/cwru_ariac_2019.git git clone https://github.com/cwru-eecs-373/ecse_373_ariac.git @@ -69,6 +69,6 @@ rosdep update rosdep install --from-paths src --ignore-src -r -y -catkin_make +# catkin_make -j 4 -l 4.0 -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic -catkin_make -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic install +catkin_make -j 4 -l 4.0 -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic install diff --git a/o405-uxx/user-data b/o405-uxx/user-data index 8dcc55a..e52afb7 100644 --- a/o405-uxx/user-data +++ b/o405-uxx/user-data @@ -4,50 +4,59 @@ autoinstall: locale: en_US keyboard: layout: us - early-commands: - # Add ROS to the installation - - echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list - - curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add - - - apt update - refresh-installer: - update: true - apt: - ## Add ROS the the installed system - sources: - ros-latest.list: - source: "deb http://packages.ros.org/ros/ubuntu $RELEASE main" - key: | - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1 + timezone: America/Detroit + # early-commands: + # # Add ROS to the installation + # - echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list + # - curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add - + # - apt update + # refresh-installer: + # update: true + # apt: + # ## Add ROS the the installed system + # sources: + # ros-latest.list: + # source: "deb http://packages.ros.org/ros/ubuntu $RELEASE main" + # key: | + # -----BEGIN PGP PUBLIC KEY BLOCK----- + # Version: GnuPG v1 - mQINBFzvJpYBEADY8l1YvO7iYW5gUESyzsTGnMvVUmlV3XarBaJz9bGRmgPXh7jc - VFrQhE0L/HV7LOfoLI9H2GWYyHBqN5ERBlcA8XxG3ZvX7t9nAZPQT2Xxe3GT3tro - u5oCR+SyHN9xPnUwDuqUSvJ2eqMYb9B/Hph3OmtjG30jSNq9kOF5bBTk1hOTGPH4 - K/AY0jzT6OpHfXU6ytlFsI47ZKsnTUhipGsKucQ1CXlyirndZ3V3k70YaooZ55rG - aIoAWlx2H0J7sAHmqS29N9jV9mo135d+d+TdLBXI0PXtiHzE9IPaX+ctdSUrPnp+ - TwR99lxglpIG6hLuvOMAaxiqFBB/Jf3XJ8OBakfS6nHrWH2WqQxRbiITl0irkQoz - pwNEF2Bv0+Jvs1UFEdVGz5a8xexQHst/RmKrtHLct3iOCvBNqoAQRbvWvBhPjO/p - V5cYeUljZ5wpHyFkaEViClaVWqa6PIsyLqmyjsruPCWlURLsQoQxABcL8bwxX7UT - hM6CtH6tGlYZ85RIzRifIm2oudzV5l+8oRgFr9yVcwyOFT6JCioqkwldW52P1pk/ - /SnuexC6LYqqDuHUs5NnokzzpfS6QaWfTY5P5tz4KHJfsjDIktly3mKVfY0fSPVV - okdGpcUzvz2hq1fqjxB6MlB/1vtk0bImfcsoxBmF7H+4E9ZN1sX/tSb0KQARAQAB - tCZPcGVuIFJvYm90aWNzIDxpbmZvQG9zcmZvdW5kYXRpb24ub3JnPokCVAQTAQgA - PgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBMHPbjHmut6IaLFytPQu1vur - F8ZUBQJgsdhRBQkLTMW7AAoJEPQu1vurF8ZUTMwP/3f7EkOPIFjUdRmpNJ2db4iB - RQu5b2SJRG+KIdbvQBzKUBMV6/RUhEDPjhXZI3zDevzBewvAMKkqs2Q1cWo9WV7Z - PyTkvSyey/Tjn+PozcdvzkvrEjDMftIk8E1WzLGq7vnPLZ1q/b6Vq4H373Z+EDWa - DaDwW72CbCBLWAVtqff80CwlI2x8fYHKr3VBUnwcXNHR4+nRABfAWnaU4k+oTshC - Qucsd8vitNfsSXrKuKyz91IRHRPnJjx8UvGU4tRGfrHkw1505EZvgP02vXeRyWBR - fKiL1vGy4tCSRDdZO3ms2J2m08VPv65HsHaWYMnO+rNJmMZj9d9JdL/9GRf5F6U0 - quoIFL39BhUEvBynuqlrqistnyOhw8W/IQy/ymNzBMcMz6rcMjMwhkgm/LNXoSD1 - 1OrJu4ktQwRhwvGVarnB8ihwjsTxZFylaLmFSfaA+OAlOqCLS1OkIVMzjW+Ul6A6 - qjiCEUOsnlf4CGlhzNMZOx3low6ixzEqKOcfECpeIj80a2fBDmWkcAAjlHu6VBhA - TUDG9e2xKLzV2Z/DLYsb3+n9QW7KO0yZKfiuUo6AYboAioQKn5jh3iRvjGh2Ujpo - 22G+oae3PcCc7G+z12j6xIY709FQuA49dA2YpzMda0/OX4LP56STEveDRrO+CnV6 - WE+F5FaIKwb72PL4rLi4 - =i0tj - -----END PGP PUBLIC KEY BLOCK----- + # mQINBFzvJpYBEADY8l1YvO7iYW5gUESyzsTGnMvVUmlV3XarBaJz9bGRmgPXh7jc + # VFrQhE0L/HV7LOfoLI9H2GWYyHBqN5ERBlcA8XxG3ZvX7t9nAZPQT2Xxe3GT3tro + # u5oCR+SyHN9xPnUwDuqUSvJ2eqMYb9B/Hph3OmtjG30jSNq9kOF5bBTk1hOTGPH4 + # K/AY0jzT6OpHfXU6ytlFsI47ZKsnTUhipGsKucQ1CXlyirndZ3V3k70YaooZ55rG + # aIoAWlx2H0J7sAHmqS29N9jV9mo135d+d+TdLBXI0PXtiHzE9IPaX+ctdSUrPnp+ + # TwR99lxglpIG6hLuvOMAaxiqFBB/Jf3XJ8OBakfS6nHrWH2WqQxRbiITl0irkQoz + # pwNEF2Bv0+Jvs1UFEdVGz5a8xexQHst/RmKrtHLct3iOCvBNqoAQRbvWvBhPjO/p + # V5cYeUljZ5wpHyFkaEViClaVWqa6PIsyLqmyjsruPCWlURLsQoQxABcL8bwxX7UT + # hM6CtH6tGlYZ85RIzRifIm2oudzV5l+8oRgFr9yVcwyOFT6JCioqkwldW52P1pk/ + # /SnuexC6LYqqDuHUs5NnokzzpfS6QaWfTY5P5tz4KHJfsjDIktly3mKVfY0fSPVV + # okdGpcUzvz2hq1fqjxB6MlB/1vtk0bImfcsoxBmF7H+4E9ZN1sX/tSb0KQARAQAB + # tCZPcGVuIFJvYm90aWNzIDxpbmZvQG9zcmZvdW5kYXRpb24ub3JnPokCVAQTAQgA + # PgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBMHPbjHmut6IaLFytPQu1vur + # F8ZUBQJgsdhRBQkLTMW7AAoJEPQu1vurF8ZUTMwP/3f7EkOPIFjUdRmpNJ2db4iB + # RQu5b2SJRG+KIdbvQBzKUBMV6/RUhEDPjhXZI3zDevzBewvAMKkqs2Q1cWo9WV7Z + # PyTkvSyey/Tjn+PozcdvzkvrEjDMftIk8E1WzLGq7vnPLZ1q/b6Vq4H373Z+EDWa + # DaDwW72CbCBLWAVtqff80CwlI2x8fYHKr3VBUnwcXNHR4+nRABfAWnaU4k+oTshC + # Qucsd8vitNfsSXrKuKyz91IRHRPnJjx8UvGU4tRGfrHkw1505EZvgP02vXeRyWBR + # fKiL1vGy4tCSRDdZO3ms2J2m08VPv65HsHaWYMnO+rNJmMZj9d9JdL/9GRf5F6U0 + # quoIFL39BhUEvBynuqlrqistnyOhw8W/IQy/ymNzBMcMz6rcMjMwhkgm/LNXoSD1 + # 1OrJu4ktQwRhwvGVarnB8ihwjsTxZFylaLmFSfaA+OAlOqCLS1OkIVMzjW+Ul6A6 + # qjiCEUOsnlf4CGlhzNMZOx3low6ixzEqKOcfECpeIj80a2fBDmWkcAAjlHu6VBhA + # TUDG9e2xKLzV2Z/DLYsb3+n9QW7KO0yZKfiuUo6AYboAioQKn5jh3iRvjGh2Ujpo + # 22G+oae3PcCc7G+z12j6xIY709FQuA49dA2YpzMda0/OX4LP56STEveDRrO+CnV6 + # WE+F5FaIKwb72PL4rLi4 + # =i0tj + # -----END PGP PUBLIC KEY BLOCK----- +# packages: +# - ubuntu-desktop +# snaps: +# - name: firefox +# - name: gnome-3-38-2004 +# - name: gtk-common-themes +# - name: snap-store +# - name: snapd-desktop-integration ssh: install-server: true allow-pw: true @@ -83,9 +92,11 @@ autoinstall: # - wget -O /target/postinstall.sh http://192.168.0.2/postinstall.sh # - curtin in-target -- bash /postinstall.sh # - rm /target/postinstall.sh - - wget -O /target/postinstall.sh http://raw.githubusercontent.com/cwru-robotics/cwru_robotics_autoinstall_scripts/focal_install/o405-uxx/postinstall.sh + # - wget -O /target/postinstall.sh http://raw.githubusercontent.com/cwru-robotics/cwru_robotics_autoinstall_scripts/focal_install/o405-uxx/postinstall.sh + # - curtin in-target -- bash /postinstall.sh + # - rm /target/postinstall.sh + - cp /cdrom/postinstall.sh /target/postinstall.sh - curtin in-target -- bash /postinstall.sh - - rm /target/postinstall.sh user-data: disable_root: false