Skip to content

Commit 39ae717

Browse files
committed
Supress conflict with anaconda distibution and other smaller improvements to grub2 config files...
1 parent 89ca0a9 commit 39ae717

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

build_pkg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class pkg():
102102

103103
with open("stdeb.cfg", "w") as f:
104104
f.write(stdcfg)
105-
if subprocess.call('python3.5 setup.py --command-packages=stdeb.command bdist_deb', shell=True) == 0 and \
105+
if subprocess.call('/usr/bin/python3.5 setup.py --command-packages=stdeb.command bdist_deb', shell=True) == 0 and \
106106
os.path.exists(os.path.join("deb_dist", "python3-multibootusb_" + self.version + "-1_all.deb")):
107107
try:
108108
shutil.copy2(os.path.join("deb_dist", "python3-multibootusb_" + self.version + "-1_all.deb"),
@@ -130,7 +130,7 @@ class pkg():
130130
"Requires = " + require)
131131
with open("setup.cfg", "w") as f:
132132
f.write(setup_cfg)
133-
if subprocess.call('python3.5 setup.py bdist_rpm', shell=True) == 0 and \
133+
if subprocess.call('/usr/bin/python3.5 setup.py bdist_rpm', shell=True) == 0 and \
134134
os.path.exists(os.path.join("dist", "multibootusb-" + self.version + "-1.noarch.rpm")):
135135
if self.pkg_name == 'suse':
136136
package = "multibootusb-" + self.version + "-1suse.noarch.rpm"
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
for isofile in $isopath/grml*.iso; do
2+
if [ -e "$isofile" ]; then
3+
regexp --set=isoname "$isopath/(.*)" "$isofile"
4+
submenu "$isoname (loopback.cfg) ->" "$isofile" {
5+
iso_path="$2"
6+
export iso_path
7+
search --set=root --file "$iso_path"
8+
loopback loop "$iso_path"
9+
root=(loop)
10+
configfile /boot/grub/loopback.cfg
11+
loopback --delete loop
12+
}
13+
fi
14+
done

data/multibootusb/grub/menus/pfsense.d/generic64.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
insmod ufs2
2-
insmod bsd
31
for isofile in $isopath/pfSense-*-amd64.iso; do
42
if [ -e "$isofile" ]; then
53
regexp --set=isoname "$isopath/(.*)" "$isofile"

data/multibootusb/grub/menus/tinycore.d/tinycore-generic.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
for isofile in $isopath/TinyCore-*.iso; do
2-
echo $isopath
32
if [ -e "$isofile" ]; then
43
regexp --set=isoname "$isopath/(.*)" "$isofile"
54
submenu "$isoname ->" "$isofile" {

0 commit comments

Comments
 (0)