diff --git a/iso_configs/hooks/normal/0540-misc.hook.chroot b/iso_configs/hooks/normal/0540-misc.hook.chroot index dfe0b08a..59889d29 100755 --- a/iso_configs/hooks/normal/0540-misc.hook.chroot +++ b/iso_configs/hooks/normal/0540-misc.hook.chroot @@ -29,11 +29,21 @@ ln -s /usr/share/desktop-base/active-theme/grub/pep-grub-16x9.png /etc/alternati # https://github.com/hectorm/hblock # This does not enable it. The user has the choice to turn it on # by enabling it in PepHub or by typing 'hblock -S builtin' in terminal -curl https://raw.githubusercontent.com/hectorm/hblock/master/hblock --output /tmp/hblock && -[ "$(sha256sum /tmp/hblock)" == "4031d86cd04fd7c6cb1b7e9acb1ffdbe9a3f84f693bfb287c68e1f1fa2c14c3b" ] && - mv /tmp/hblock /usr/local/bin/hblock && - chown 0:0 /usr/local/bin/hblock && - chmod 755 /usr/local/bin/hblock && - echo " hblock: installed" || - echo " hblock: failed to install" - #hblock -S none -D none exit 0 +curl https://raw.githubusercontent.com/hectorm/hblock/master/hblock --output /tmp/hblock +[ "$(sha256sum /tmp/hblock)" == "4031d86cd04fd7c6cb1b7e9acb1ffdbe9a3f84f693bfb287c68e1f1fa2c14c3b" ] +mv /tmp/hblock /usr/local/bin/hblock +chown 0:0 /usr/local/bin/hblock +chmod 755 /usr/local/bin/hblock +hblock -S none -D none exit 0 + +# check to see if this is the main line if it is then +# take care of raspi +if [ -e /usr/share/peppermint/pep_id ] +then + apt remove raspi-firmware -y + apt purge raspi-firmware -y + apt autoremove -t +else + echo "not there" +fi + diff --git a/iso_configs/id_files/pep_id b/iso_configs/id_files/pep_id new file mode 100644 index 00000000..089f8874 --- /dev/null +++ b/iso_configs/id_files/pep_id @@ -0,0 +1 @@ +ID=Maine_Line diff --git a/python_modules/deb_64.py b/python_modules/deb_64.py index 4dbe37fe..703411f4 100644 --- a/python_modules/deb_64.py +++ b/python_modules/deb_64.py @@ -101,6 +101,9 @@ def copy_deb64_specific(): shutil.copy(cur_dir + paths.src_deb64_sourcelist, WP_CHROOT + paths.des_sourcelist ) + shutil.copy(cur_dir + paths.src_main_line_pep_id, + WP_CHROOT + paths.des_main_line_pep_id + ) def run_build(): diff --git a/python_modules/paths.py b/python_modules/paths.py index 60604c25..965945eb 100644 --- a/python_modules/paths.py +++ b/python_modules/paths.py @@ -335,3 +335,6 @@ src_debarm_sourcelist = '/sources/deb_arm/sources.list' src_devarm_sourcelist = '/sources/dev_arm/sources.list' des_sourcelist = '/opt/pepconf/sources.list' +# Main line ID File +src_main_line_pep_id = '/id_files/pep_id' +des_main_line_pep_id = '/usr/share/peppermint/pep_id'