Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit c8b471c9 authored by Robert Nelson's avatar Robert Nelson
Browse files

Revert "RootStock-NG: switch to spaces for easier debugging" 

This reverts commit fa54abee

.

it broke things, debug later...

Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent fa54abee
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 133 additions and 136 deletions
scripts/chroot.sh
+ 133
− 136
View file @ c8b471c9
...@@ -258,171 +258,168 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ ...@@ -258,171 +258,168 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
check_n_install () { check_n_install () {
unset deb_pkgs unset deb_pkgs
dpkg -l | grep "\${pkg}" >/dev/null || deb_pkgs="\${pkg} " dpkg -l | grep "\${pkg}" >/dev/null || deb_pkgs="\${pkg} "
if [ "\${deb_pkgs}" ] ; then if [ "\${deb_pkgs}" ] ; then
apt-get -y --force-yes install \${deb_pkgs} apt-get -y --force-yes install \${deb_pkgs}
fi fi
} }
stop_init () { stop_init () {
cat > /usr/sbin/policy-rc.d <<EOF cat > /usr/sbin/policy-rc.d <<EOF
#!/bin/sh #!/bin/sh
exit 101 exit 101
EOF EOF
chmod +x /usr/sbin/policy-rc.d chmod +x /usr/sbin/policy-rc.d
if [ "x\${distro}" = "xUbuntu" ] ; then if [ "x\${distro}" = "xUbuntu" ] ; then
dpkg-divert --local --rename --add /sbin/initctl dpkg-divert --local --rename --add /sbin/initctl
ln -s /bin/true /sbin/initctl ln -s /bin/true /sbin/initctl
fi fi
} }
install_pkg_updates () { install_pkg_updates () {
apt-get update apt-get update
packages="initramfs-tools lsb-release sudo wget" packages="initramfs-tools lsb-release sudo wget"
for pkg in \${packages} ; do check_n_install ; done for pkg in \${packages} ; do check_n_install ; done
distro="\$(lsb_release -si)" distro="\$(lsb_release -si)"
echo "distro=\${distro}" > /etc/rcn-ee.conf echo "distro=\${distro}" > /etc/rcn-ee.conf
apt-get upgrade -y --force-yes apt-get upgrade -y --force-yes
} }
install_pkgs () { install_pkgs () {
apt-get -y --force-yes install ${base_pkg_list} apt-get -y --force-yes install ${base_pkg_list}
} }
dl_pkg_src () { dl_pkg_src () {
mkdir -p /tmp/pkg_src/ mkdir -p /tmp/pkg_src/
cd /tmp/pkg_src/ cd /tmp/pkg_src/
dpkg -l | tail -n+6 | awk '{print \$2}' | sed "s/:armel//g" | sed "s/:armhf//g" > /tmp/pkg_src/pkg_list dpkg -l | tail -n+6 | awk '{print \$2}' | sed "s/:armel//g" | sed "s/:armhf//g" > /tmp/pkg_src/pkg_list
apt-get source --download-only \`cat /tmp/pkg_src/pkg_list\` apt-get source --download-only \`cat /tmp/pkg_src/pkg_list\`
cd - cd -
} }
dl_kernel () { dl_kernel () {
wget --no-verbose --directory-prefix=/tmp/ \${kernel_url} wget --no-verbose --directory-prefix=/tmp/ \${kernel_url}
#This should create a list of files on the server #This should create a list of files on the server
#<a href="file"></a> #<a href="file"></a>
cat /tmp/index.html | grep "<a href=" > /tmp/temp.html cat /tmp/index.html | grep "<a href=" > /tmp/temp.html
#Note: cat drops one \... #Note: cat drops one \...
#sed -i -e "s/<a href/\\n<a href/g" /tmp/temp.html #sed -i -e "s/<a href/\\n<a href/g" /tmp/temp.html
sed -i -e "s/<a href/\\\n<a href/g" /tmp/temp.html sed -i -e "s/<a href/\\\n<a href/g" /tmp/temp.html
sed -i -e 's/\"/\"><\/a>\n/2' /tmp/temp.html sed -i -e 's/\"/\"><\/a>\n/2' /tmp/temp.html
cat /tmp/temp.html | grep href > /tmp/index.html cat /tmp/temp.html | grep href > /tmp/index.html
unset deb_file deb_file=\$(cat /tmp/index.html | grep linux-image)
deb_file=\$(cat /tmp/index.html | grep linux-image) deb_file=\$(echo \${deb_file} | awk -F ".deb" '{print \$1}')
deb_file=\$(echo \${deb_file} | awk -F ".deb" '{print \$1}') deb_file=\${deb_file##*linux-image-}
deb_file=\${deb_file##*linux-image-}
if [ "\${deb_file}" ] ; then kernel_version=\$(echo \${deb_file} | awk -F "_" '{print \$1}')
kernel_version=\$(echo \${deb_file} | awk -F "_" '{print \$1}') echo "Log: Using: \${kernel_version}"
echo "Log: Using: \${kernel_version}"
deb_file="linux-image-\${deb_file}.deb"
deb_file="linux-image-\${deb_file}.deb" wget --directory-prefix=/tmp/ \${kernel_url}\${deb_file}
wget --directory-prefix=/tmp/ \${kernel_url}\${deb_file}
unset dtb_file
unset dtb_file dtb_file=\$(cat /tmp/index.html | grep dtbs.tar.gz | head -n 1)
dtb_file=\$(cat /tmp/index.html | grep dtbs.tar.gz | head -n 1) dtb_file=\$(echo \${dtb_file} | awk -F "\"" '{print \$2}')
dtb_file=\$(echo \${dtb_file} | awk -F "\"" '{print \$2}')
if [ "\${dtb_file}" ] ; then
if [ "\${dtb_file}" ] ; then wget --directory-prefix=/boot/ \${kernel_url}\${dtb_file}
wget --directory-prefix=/boot/ \${kernel_url}\${dtb_file} fi
fi
unset firmware_file
unset firmware_file firmware_file=\$(cat /tmp/index.html | grep firmware.tar.gz | head -n 1)
firmware_file=\$(cat /tmp/index.html | grep firmware.tar.gz | head -n 1) firmware_file=\$(echo \${firmware_file} | awk -F "\"" '{print \$2}')
firmware_file=\$(echo \${firmware_file} | awk -F "\"" '{print \$2}')
if [ "\${firmware_file}" ] ; then
if [ "\${firmware_file}" ] ; then wget --directory-prefix=/tmp/ \${kernel_url}\${firmware_file}
wget --directory-prefix=/tmp/ \${kernel_url}\${firmware_file}
mkdir -p /tmp/cape-firmware/
mkdir -p /tmp/cape-firmware/ tar xf /tmp/\${firmware_file} -C /tmp/cape-firmware/
tar xf /tmp/\${firmware_file} -C /tmp/cape-firmware/ cp -v /tmp/cape-firmware/*.dtbo /lib/firmware/ 2>/dev/null
cp -v /tmp/cape-firmware/*.dtbo /lib/firmware/ 2>/dev/null rm -rf /tmp/cape-firmware/ || true
rm -rf /tmp/cape-firmware/ || true rm -f /tmp/\${firmware_file} || true
rm -f /tmp/\${firmware_file} || true fi
fi
dpkg -x /tmp/\${deb_file} /
dpkg -x /tmp/\${deb_file} /
depmod \${kernel_version}
depmod \${kernel_version} update-initramfs -c -k \${kernel_version}
update-initramfs -c -k \${kernel_version} rm -f /tmp/index.html || true
rm -f /tmp/temp.html || true
rm -f /tmp/\${deb_file} || true rm -f /tmp/\${deb_file} || true
rm -f /boot/System.map-\${kernel_version} || true rm -f /boot/System.map-\${kernel_version} || true
rm -f /boot/config-\${kernel_version} || true rm -f /boot/config-\${kernel_version} || true
rm -rf /usr/src/linux-headers* || true rm -rf /usr/src/linux-headers* || true
fi
rm -f /tmp/temp.html || true
rm -f /tmp/index.html || true
} }
add_user () { add_user () {
groupadd admin || true groupadd admin || true
echo "%admin ALL=(ALL) ALL" >>/etc/sudoers echo "%admin ALL=(ALL) ALL" >>/etc/sudoers
default_groups="admin,adm,dialout,cdrom,floppy,audio,dip,video" default_groups="admin,adm,dialout,cdrom,floppy,audio,dip,video"
pass_crypt=\$(perl -e 'print crypt(\$ARGV[0], "rcn-ee-salt")' ${password}) pass_crypt=\$(perl -e 'print crypt(\$ARGV[0], "rcn-ee-salt")' ${password})
useradd -G "\${default_groups}" -s /bin/bash -m -p \${pass_crypt} -c "${full_name}" ${user_name} useradd -G "\${default_groups}" -s /bin/bash -m -p \${pass_crypt} -c "${full_name}" ${user_name}
case "\${distro}" in case "\${distro}" in
Debian) Debian)
usermod -aG sudo debian || true usermod -aG sudo debian || true
usermod -aG dialout debian || true usermod -aG dialout debian || true
passwd <<-EOF passwd <<-EOF
root root
root root
EOF EOF
;; ;;
Ubuntu) Ubuntu)
passwd -l root || true passwd -l root || true
;; ;;
esac esac
} }
debian_startup_script () { debian_startup_script () {
if [ -f /etc/init.d/board_tweaks.sh ] ; then if [ -f /etc/init.d/board_tweaks.sh ] ; then
chown root:root /etc/init.d/board_tweaks.sh chown root:root /etc/init.d/board_tweaks.sh
chmod +x /etc/init.d/board_tweaks.sh chmod +x /etc/init.d/board_tweaks.sh
insserv board_tweaks.sh || true insserv board_tweaks.sh || true
fi fi
} }
startup_script () { startup_script () {
case "\${distro}" in case "\${distro}" in
Debian) Debian)
debian_startup_script debian_startup_script
;; ;;
esac esac
} }
cleanup () { cleanup () {
if [ -f /etc/apt/apt.conf ] ; then if [ -f /etc/apt/apt.conf ] ; then
rm -rf /etc/apt/apt.conf || true rm -rf /etc/apt/apt.conf || true
fi fi
apt-get update apt-get update
apt-get clean apt-get clean
rm -f /usr/sbin/policy-rc.d rm -f /usr/sbin/policy-rc.d
if [ "x\${distro}" = "xUbuntu" ] ; then if [ "x\${distro}" = "xUbuntu" ] ; then
rm -f /sbin/initctl || true rm -f /sbin/initctl || true
dpkg-divert --local --rename --remove /sbin/initctl dpkg-divert --local --rename --remove /sbin/initctl
fi fi
#left over from init/upstart scripts running in chroot... #left over from init/upstart scripts running in chroot...
if [ -d /var/run/ ] ; then if [ -d /var/run/ ] ; then
rm -rf /var/run/* || true rm -rf /var/run/* || true
fi fi
} }
#cat /chroot_script.sh #cat /chroot_script.sh
...@@ -431,11 +428,11 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ ...@@ -431,11 +428,11 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
install_pkgs install_pkgs
if [ "x${chroot_ENABLE_DEB_SRC}" = "xenable" ] ; then if [ "x${chroot_ENABLE_DEB_SRC}" = "xenable" ] ; then
dl_pkg_src dl_pkg_src
fi fi
if [ "${chroot_KERNEL_HTTP_DIR}" ] ; then if [ "${chroot_KERNEL_HTTP_DIR}" ] ; then
for kernel_url in ${chroot_KERNEL_HTTP_DIR} ; do dl_kernel ; done for kernel_url in ${chroot_KERNEL_HTTP_DIR} ; do dl_kernel ; done
fi fi
add_user add_user
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Open hardware computers for makers, educators and professionals