From 7cf972cc7d03f32e4bf97bb8d8ea5f1bcf63eb4c Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 17 Nov 2015 05:36:22 -0800 Subject: [PATCH] Remove deprecated Ubuntu; updated changelog Closes #11 and #13. As mentioned in #11, support for Ubuntu should return in the future, but not explicitly. Rather, the core of A2SERVER itself ashould be made to run on any OS distribution for which our requirements are met. The goal is that any OS-specific details should be part of OS-specific packaging or handled by the user (editing MOTD/issue files, etc.) We can handle those details on Debian systems because we know how to do that when packaging for Debian. Ubuntu, Fedora, etc. packages will have to make their own tweaks. This commit doesn't do all of that, but it does mean there's one fewer things we need to worry about during the transition. --- scripts/a2server-2-tools.txt | 2 +- scripts/a2server-3-sharing.txt | 2 +- scripts/a2server-6-samba.txt | 28 ++--------- scripts/a2server-7-console.txt | 81 +----------------------------- scripts/tools/a2server-aliases.txt | 12 ++--- setup/index.txt | 6 +-- update/versionhistory.txt | 4 +- 7 files changed, 19 insertions(+), 116 deletions(-) diff --git a/scripts/a2server-2-tools.txt b/scripts/a2server-2-tools.txt index 5929633..8f6e8de 100755 --- a/scripts/a2server-2-tools.txt +++ b/scripts/a2server-2-tools.txt @@ -123,7 +123,7 @@ sudo wget -q -O /usr/local/etc/a2server-aliases "${scriptURL}scripts/tools/a2ser grep a2server-aliases /etc/bash.bashrc > /dev/null || \ echo "source /usr/local/etc/a2server-aliases" | sudo tee -a /etc/bash.bashrc > /dev/null -[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && motd="/etc/issue" || motd="/etc/motd" +motd="/etc/motd" if [[ ! $(grep A2SERVER $motd) ]]; then echo | sudo tee -a $motd > /dev/null echo "Type 'system-shutdown' to turn off A2SERVER." | sudo tee -a $motd > /dev/null diff --git a/scripts/a2server-3-sharing.txt b/scripts/a2server-3-sharing.txt index 899d540..1486e65 100755 --- a/scripts/a2server-3-sharing.txt +++ b/scripts/a2server-3-sharing.txt @@ -4,7 +4,7 @@ # A2SERVER -- a virtual machine for sharing files to Apple II clients # by Ivan X, ivan@ivanx.com -# Installs Netatalk 2.2.4 for debian/raspbian (Wheezy) or Ubuntu (12.04) +# Installs Netatalk 2.2.4 for debian/raspbian (Wheezy) # last update: 3-Mar-15 # The lastest version of this document, and the ready-to-use premade diff --git a/scripts/a2server-6-samba.txt b/scripts/a2server-6-samba.txt index 6a08de8..fe254ee 100755 --- a/scripts/a2server-6-samba.txt +++ b/scripts/a2server-6-samba.txt @@ -18,14 +18,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupWindowsSharing ]]; then echo "A2SERVER: Setting up Windows file sharing..." sudo true - if [[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]]; then - [[ -f /etc/init/smbd.conf.off ]] && sudo mv /etc/init/smbd.conf.off /etc/init/smbd.conf - [[ -f /etc/init/nmbd.conf.off ]] && sudo mv /etc/init/nmbd.conf.off /etc/init/nmbd.conf - [[ ! -f /etc/init/smbd.conf || ! -f /etc/init/nmbd.conf ]] && installSamba=1 - else - sudo update-rc.d samba defaults &> /dev/null - [[ ! -f /etc/init.d/samba ]] && installSamba=1 - fi + sudo update-rc.d samba defaults &> /dev/null + [[ ! -f /etc/init.d/samba ]] && installSamba=1 if (( $installSamba )); then if [[ ! -f /tmp/a2server-packageReposUpdated ]]; then @@ -39,12 +33,7 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupWindowsSharing ]]; then sudo apt-get clean fi - if [[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]]; then - sudo initctl start smbd &> /dev/null - sudo initctl start nmbd &> /dev/null - else - sudo /etc/init.d/samba start &> /dev/null - fi + sudo /etc/init.d/samba start &> /dev/null workgroup=$(grep -o "^ workgroup = .*$" /etc/samba/smb.conf 2> /dev/null | cut -c 16-) [[ $workgroup ]] || workgroup="WORKGROUP" @@ -80,15 +69,8 @@ if [[ ! $autoAnswerYes || -f /tmp/a2server-setupWindowsSharing ]]; then echo echo "A2SERVER: Windows file sharing is now running." else - if [[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]]; then - sudo initctl stop smbd &> /dev/null - sudo initctl stop nmbd &> /dev/null - [[ -f /etc/init/smbd.conf ]] && sudo mv /etc/init/smbd.conf /etc/init/smbd.conf.off - [[ -f /etc/init/nmbd.conf ]] && sudo mv /etc/init/nmbd.conf /etc/init/nmbd.conf.off - else - sudo /etc/init.d/samba stop &> /dev/null - sudo update-rc.d -f samba remove &> /dev/null - fi + sudo /etc/init.d/samba stop &> /dev/null + sudo update-rc.d -f samba remove &> /dev/null echo "A2SERVER: Windows file sharing has been turned off." fi diff --git a/scripts/a2server-7-console.txt b/scripts/a2server-7-console.txt index f98d1ef..f7242a1 100755 --- a/scripts/a2server-7-console.txt +++ b/scripts/a2server-7-console.txt @@ -1,9 +1,7 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh: -# --- Ubuntu Server console optimizaton (optional) - -# This script helps when running on the Linux console within the VM. +# This script helps when running on the Linux console within a VirtualBox VM. echo @@ -27,80 +25,3 @@ if [[ $isDebian ]]; then sudo /etc/init.d/console-setup restart &> /dev/null fi fi - -# check that we're on Ubuntu -if [[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]]; then - - # don't do any of this if we're logged in via SSH - if [[ $SSH_CLIENT || $REMOTEHOST ]]; then - echo "A2SERVER: Logged in via SSH,not performing console optimization." - echo "Run setup from the console if you want to optimize the console." - else - - # if we've already done this stuff, don't do it again - if [[ ! -x /etc/update-motd.d/10-help-text ]]; then - - echo "A2SERVER: Ubuntu console has already been optimized." - else - echo "Ubuntu console optimization for use in a virtual machine will:" - echo "- show the default username/password on the login screen" - echo "- remove the documentation URL and system statistics shown after login" - echo "- ensure the screen clears before showing the login prompt" - echo "- prevent the screen from dimming after 10 minutes (once logged in)" - echo "- eliminate a harmless but annoying startup error about piix_smbus" - echo "- fix an Ubuntu 10.04 issue with slow scrolling" - echo - if [[ ! $autoAnswerYes ]]; then - echo -n "Do you want to optimize the Ubuntu console? " - read - fi - if [[ $autoAnswerYes || ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]]; then - - echo "A2SERVER: Optimizing console..." - - # remind the user how to log in (we're going for functionality here, not security) - if [[ ! $(grep $USER\/$password /etc/issue) ]]; then - sudo sed -i '/^Log in with.*$/d' /etc/issue - echo "Log in with '$USER' / '$password'." | sudo tee -a /etc/issue > /dev/null - echo | sudo tee -a /etc/issue > /dev/null - fi - - # If after logging in, you don't like the documentation URL and - # system info (or an error about it) being displayed, type: - sudo chmod -x /etc/update-motd.d/10-help-text - sudo chmod -x /etc/update-motd.d/50-landscape-sysinfo - - # If the screen doesn't clear for login after the boot messages, and - # you'd like it to, type: - sudo sed -i 's/X_DEFAULT=""/X_DEFAULT="quiet"/g' /etc/default/grub - sudo update-grub - - # If you see a piix4_smbus error on startup, it is harmless, but if you - # want to eliminate it, type: - echo -e '\nblacklist i2c_piix4' \ - | sudo tee -a /etc/modprobe.d/blacklist.conf > /dev/null - sudo update-initramfs -u -k all - - # If you want to prevent the Ubuntu screen from going blank after ten - # minutes of inactivity (once you are logged in), type: - echo -e \ - '\n[[ $SSH_CLIENT || $REMOTEHOST ]] || setterm -blank 0 -powersave off -powerdown 0' \ - | sudo tee -a /etc/profile > /dev/null - setterm -blank 0 -powersave off -powerdown 0 - - # (note: These next lines addresses an issue only for Ubuntu 10.04.) - # Type "ps aux" and press return. If you see slow text scrolling, type: - if [[ "$(lsb_release -rs 2> /dev/null)" == "10.04" ]]; then - echo -e '\nblacklist vga16fb' \ - | sudo tee -a /etc/modprobe.d/blacklist-framebuffer.conf > /dev/null - if [[ ! $SSH_CLIENT ]]; then - echo "Restarting now is recommended. To resume setup, log back" - echo -n "in, press up-arrow, and press return. Restart now? " - read; R=${REPLY:0:1} - [[ $R != "y" ]] && [[ $R != "Y" ]] || sudo shutdown -r now - fi - fi - fi - fi - fi -fi diff --git a/scripts/tools/a2server-aliases.txt b/scripts/tools/a2server-aliases.txt index ff47f7c..c57667f 100755 --- a/scripts/tools/a2server-aliases.txt +++ b/scripts/tools/a2server-aliases.txt @@ -15,7 +15,7 @@ alias raspi-config='[[ -f /usr/bin/raspi-config ]] && sudo /usr/bin/raspi-config alias raspbian-update='wget -qO /tmp/raspbian-update ivanx.com/a2server/files/raspbian-update.txt; source /tmp/raspbian-update' alias rasppleii-update='raspbian-update a2cloud a2server' -alias welcome-message-edit='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && motd=/etc/issue || motd=/etc/motd; sudo nano $motd' +alias welcome-message-edit='sudo nano /etc/motd' alias showip='ifconfig eth0 | grep "inet\ addr" | cut -d: -f2 | cut -d" " -f1' alias showmac='ifconfig eth0 | grep "HWaddr" | cut -dH -f2 | cut -c7-23' @@ -63,11 +63,11 @@ alias guest-on="sudo sed -i 's/-uamlist uams_clrtxt.so/-uamlist uams_guest.so,ua -alias samba-off='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && { sudo initctl stop smbd; sudo initctl stop nmbd; [[ -f /etc/init/smbd.conf ]] && sudo mv /etc/init/smbd.conf /etc/init/smbd.conf.off; [[ -f /etc/init/nmbd.conf ]] && sudo mv /etc/init/nmbd.conf /etc/init/nmbd.conf.off; } || { sudo /etc/init.d/samba stop; sudo update-rc.d -f samba remove &> /dev/null; }' -alias samba-on='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && { [[ -f /etc/init/smbd.conf.off ]] && sudo mv /etc/init/smbd.conf.off /etc/init/smbd.conf; [[ -f /etc/init/nmbd.conf.off ]] && sudo mv /etc/init/nmbd.conf.off /etc/init/nmbd.conf; sudo initctl start smbd; sudo initctl start nmbd; } || { sudo update-rc.d samba defaults &> /dev/null; sudo /etc/init.d/samba restart; }' -alias samba-stop='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && { sudo initctl stop smbd; sudo initctl stop nmbd; } || { sudo /etc/init.d/samba stop; }' -alias samba-start='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && { sudo initctl start smbd; sudo initctl start nmbd; } || { sudo /etc/init.d/samba start; }' -alias samba-restart='[[ $(lsb_release -d 2> /dev/null | grep Ubuntu) ]] && { sudo initctl restart smbd; sudo initctl restart nmbd; } || { sudo /etc/init.d/samba restart; }' +alias samba-off='sudo /etc/init.d/samba stop; sudo update-rc.d -f samba remove &> /dev/null' +alias samba-on='sudo update-rc.d samba defaults &> /dev/null; sudo /etc/init.d/samba restart' +alias samba-stop='sudo /etc/init.d/samba stop' +alias samba-start='sudo /etc/init.d/samba start' +alias samba-restart='sudo /etc/init.d/samba restart' alias gsfiles-share="sudo sed -i 's/^\/media\/A2SHARED\/GSFILES\ GSFILES options:prodos/#share1/' /usr/local/etc/netatalk/AppleVolumes.default" alias gsfiles-unshare="sudo sed -i 's/^#share1/\/media\/A2SHARED\/GSFILES\ GSFILES options:prodos/' /usr/local/etc/netatalk/AppleVolumes.default; [[ -d /media/A2SHARED/GSFILES ]] || mkdir /media/A2SHARED/GSFILES" diff --git a/setup/index.txt b/setup/index.txt index 50dcb91..a0a00ce 100755 --- a/setup/index.txt +++ b/setup/index.txt @@ -1,9 +1,9 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh: -# A2SERVER master setup script, last update 15-Feb-2015 +# A2SERVER master setup script, last update 17-Nov-15 # it downloads and executes several scripts related to the setup of -# netatalk configured for Apple II use on Debian, Raspbian, or Ubuntu. +# netatalk configured for Apple II use on Debian or Raspbian. # more info is at http://appleii.ivanx.com/a2server # to download and execute, type: @@ -102,8 +102,6 @@ if [[ $isRpi ]]; then #supported Raspbian? (16-Feb-15, 20-Jun-14, 09-Jan-14, etc -960832a6c2590635216c296b6ee0bebf67b21d50-" [[ "$fwsupported" == *-$fwhash-* ]] && unsupportedOS=0 [[ ($fwhash == "8aca5762") || ($fwhash == "462f3e3f476f7b6") || ($fwhash == "c32bc633039cd9") || ($fwhash == "9d34d0475f9") || ($fwhash == "d4f5315cfac4e") || ($fwhash == "6f4a90c8cb8817f") || ($fwhash == "5dd9b4962e") || ($fwhash == "17c8799375") ]] && unsupportedOS=0 -elif [[ "$(lsb_release -rs 2> /dev/null)" == "12.04" ]]; then #Ubuntu 12.04? - unsupportedOS=0 elif [[ "$(lsb_release -rs 2> /dev/null)" == "7.3" || "$(lsb_release -rs 2> /dev/null)" == "7.6" || "$(lsb_release -rs 2> /dev/null)" == "7.8" ]]; then # tested Debian? unsupportedOS=0 fi diff --git a/update/versionhistory.txt b/update/versionhistory.txt index bc49391..1e3412a 100644 --- a/update/versionhistory.txt +++ b/update/versionhistory.txt @@ -60,4 +60,6 @@ 1.3.0: Oct 2015: support for using A2SERVER scripts from a location other than appleii.ivanx.com/a2server for development purposes - Nov 2015: Merged Ivan's 1.2.5 release + Nov 2015: Merged Ivan's 1.2.5 release, removed support for Ubuntu for + now (see RasppleII/a2server#11), patched ProDOS 8 in boot + files for current year table