updates to member card installation instructions

diff --git a/README.mdwn b/README.mdwn
index 3424cf8daf0ba14c4920d8b36491faf0df66f4bb..79c795c24e0f9e2422d404deed7038d60dafcd2d 100644 (file)
--- a/README.mdwn
+++ b/README.mdwn
@@ -4,28 +4,25 @@
 
 This script assumes that you are starting with the special ISO from the
 following URL. It already contains video files that the script in this repo
-will not try to download. If you are not starting with that image, I suggest
-uncommenting the code in `install-extras.sh`.
+will not try to download.
 
-<http://jenkins.trisquel.info/makeiso-etiona/iso/trisquel_9.0-fsf_i686.iso>
+<https://cdbuilds.trisquel.org/fsf/trisquel_11.0-fsf_amd64.iso>
 
-The corresponding source code ISO can be found here:
+The corresponding source code tar can be found here:
 
-<http://jenkins.trisquel.info/makeiso-etiona/iso/trisquel_9.0fsf_sources.iso>
+<https://cdbuilds.trisquel.org/fsf/trisquel_11.0_sources.tar>
 
 Feel free to test your download with the `trisquel_9.0-fsf_i686.iso.sha256`
 file in this repo:
 
-    sha2565sum -c trisquel_9.0-fsf_i686.iso.sha256
-    sha2565sum -c trisquel_9.0fsf_sources.iso.sha256
+    sha2565sum -c trisquel_11.0-fsf_amd64.iso.sha256
+    sha2565sum -c trisquel_11.0_sources.tar.sha256
 
-If you want to use a 64 bit image instead, you can get one below, but you'll
-have to copy over the `fsf` directory from the image linked above to your
-member card. Otherwise, you'll be missing the video files that are included in
-the i686 ISO above. The browser window will also currently not launch after
-boot on the alternate 64 bit system.
+If you don't have access to the FSF version of the Trisquel images, refer to
+the following script and files:
 
-<http://jenkins.trisquel.info/makeiso-etiona/iso/trisquel_9.0_amd64.iso>
+<https://gitlab.trisquel.org/trisquel/makeiso/-/blob/master/makeiso.sh>
+<https://gitlab.trisquel.org/trisquel/makeiso/-/tree/master/files/fsf/GNUAV>
 
 ## Making a bootable USB drive
 
@@ -47,13 +44,13 @@ Check files, install them, and run the script:
     dpkg -i syslinux-common_4.05+dfsg-6+deb8u1_all.deb
     dpkg -i syslinux_4.05+dfsg-6+deb8u1_amd64.deb
 
-    sudo ./live-usb-loader.sh trisquel_9.0-fsf_i686.iso /dev/sdb
+    sudo ./live-usb-loader.sh trisquel_11.0-fsf_amd64.iso /dev/sdb
 
 ## Installing extra media, including Trisquel 9 source code
 
 This command also updates the Web page that shows up on boot.
 
-    sudo ./install-extras.sh trisquel_9.0fsf_sources.iso /dev/sdb
+    sudo ./install-extras.sh trisquel_11.0_sources.tar /dev/sdb
 
 ## Notes about video files and free space
 

diff --git a/live-usb-loader.sh b/live-usb-loader.sh
index 1e74610db0be8a9461dc373b6363a2ea50dd9ac8..0fb2d620e087fd7748c9d3fc7e209ee2f4a0e366 100755 (executable)
--- a/live-usb-loader.sh
+++ b/live-usb-loader.sh
@@ -24,7 +24,7 @@ usage(){
 echo
 echo You need to run this script as root
 echo Usage: sudo $0 distro.iso /dev/sdX
-echo Example: sudo $0 foobar_5.0_i386.iso /dev/sdb
+echo Example: sudo $0 trisquel_11.0-fsf_amd64.iso /dev/sdb
 echo
 echo WARNING!: this script will delete all data on the whole disk you pass as the second parameter. Make sure it is your USB drive and not your internal hard drive!
 echo ANOTHER WARNING!: This script can bite your dog. Use it with care, backup your data.