William Pitcock avatar William Pitcock committed 357f513

debian-base: install linux-image-$debarch to avoid ambiguity

Comments (0)

Files changed (2)


 print "Interpret results:"
-interpret_parsetree(tree, {'chroot': sys.argv[2], 'simulate': 'simulate' in sys.argv})
+interpret_parsetree(tree, {'chroot': sys.argv[2], 'simulate': 'simulate' in sys.argv, 'arch': 'x86_64', 'debarch': 'amd64'})


 {% extends "base.spec" %}
 {% set possible_launch_cmds=['/sbin/start-stop-daemon', '/usr/sbin/invoke-rc.d'] %}
 {% block bootstrap %}
-	{"operation": "runcmd", "chroot": false, "command": ["debootstrap", "{{ distribution }}", "$chroot"]},
+	{"operation": "runcmd", "chroot": false, "command": ["debootstrap", "--arch", "$debarch", "{{ distribution }}", "$chroot"]},
 	{% for command in possible_launch_cmds %}
 		{"operation": "runcmd", "chroot": true, "command": ["mv", "{{ command }}", "{{ command }}.REAL"]},
 		{"operation": "runcmd", "chroot": true, "command": ["ln", "-sf", "/bin/true", "{{ command }}"]},
 	{"operation": "runcmd", "chroot": true, "command": ["apt-get", "-y", "--force-yes", "update"]},
 	{"operation": "runcmd", "chroot": true, "command": ["apt-get", "-y", "--force-yes", "install", "openssh-server", "e2fsprogs"]},
 	{% block kernelinst %}
-		{"operation": "runcmd", "chroot": true, "command": ["apt-get", "-y", "--force-yes", "install", "linux-image"]},
+		{"operation": "runcmd", "chroot": true, "command": ["apt-get", "-y", "--force-yes", "install", "linux-image-$debarch"]},
 		{% if 'xen-tweaks' in phases %}
 			{"operation": "render_template", "template": "debian/grub-menu.lst.tmpl", "target": "/boot/grub/menu.lst"},
 		{% endif %}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.